|
|
@@ -9,6 +9,8 @@ import com.diagbot.entity.Organization;
|
|
|
import com.diagbot.entity.User;
|
|
|
import com.diagbot.entity.UserAuthentication;
|
|
|
import com.diagbot.entity.UserOrganization;
|
|
|
+import com.diagbot.exception.CommonErrorCode;
|
|
|
+import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.facade.OrganizationFacade;
|
|
|
import com.diagbot.facade.UserAuthenticationFacade;
|
|
|
import com.diagbot.facade.UserFacade;
|
|
|
@@ -95,7 +97,7 @@ public class UserInfoController {
|
|
|
@PostMapping("/auditUserInfoAll")
|
|
|
@SysLogger("auditUserInfoAll")
|
|
|
@Transactional
|
|
|
- public RespDTO<UserInfoAuditVO> auditUserInfoAll(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
|
|
|
+ public RespDTO<Boolean> auditUserInfoAll(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
|
|
|
Map<String, Object> auditMap = new HashMap<String, Object>();
|
|
|
auditMap.put("userId", userInfoAuditVO.getUserId());
|
|
|
auditMap.put("modifier",UserUtils.getCurrentPrincipleID());
|
|
|
@@ -106,10 +108,10 @@ public class UserInfoController {
|
|
|
// TODO 审核前先验证该用户的的认证状态
|
|
|
boolean res = userFacade.auditUserInfoAll(auditMap);
|
|
|
|
|
|
- if (res == true) {
|
|
|
- return RespDTO.onSuc("审核通过！");
|
|
|
+ if (!res){
|
|
|
+ throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
|
|
|
}
|
|
|
- return RespDTO.onSuc("审核失败！");
|
|
|
+ return RespDTO.onSuc(res);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "删除用户信息和机构信息", notes = "用户信息和机构信息")
|
gaodm