修改人

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -163,8 +163,8 @@ public class AuditController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        String staffId = login.getStaffId();
-		String staffName = login.getStaffName();
+        String staffId = login.getClerkId();
+		String staffName = login.getClerkName();
 		String[] s = auditIds.split(",");
 		int successCount = 0;
 		int failCount = 0;
@@ -192,8 +192,8 @@ public class AuditController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        String staffId = login.getStaffId();
-		String staffName = login.getStaffName();
+        String staffId = login.getClerkId();
+		String staffName = login.getClerkName();
         auditApiService.refuse(auditId, auditReason, staffId, staffName);
         return resultResponse(HaoBanErrCode.ERR_1);
 	}
@@ -202,8 +202,8 @@ public class AuditController extends WebBaseController{
 	@RequestMapping("audit")
 	public HaobanResponse audit(String auditId,String auditName ) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-			String staffId = login.getStaffId();
-		String staffName = login.getStaffName();
+			String staffId = login.getClerkId();
+		String staffName = login.getClerkName();
 		if(StringUtils.isAnyBlank(auditId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -67,13 +67,12 @@ public class WelcomeController extends WebBaseController {
         qdto.setWxEnterpriseId(qo.getWxEnterpriseId());
         qdto.setTitle(qo.getTitle());
         qdto.setWelcomeContent(qo.getWelcomeContent());
-        qdto.setOperatorId(login.getStaffId());
-        qdto.setOperatorName(login.getStaffName());
+        qdto.setOperatorId(null);
+        qdto.setOperatorName(null);
         qdto.setDefaultWelcomeFlag(qo.getDefaultWelcomeFlag());
         qdto.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaQDTO.class, qo.getWelcomeMediaList()));
         qdto.setSuitDepartmentAddList(qo.getSuitDepartmentAddList());
         qdto.setSuitDepartmentDeleteList(qo.getSuitDepartmentDeleteList());
-        // 员工暂时不传
         qdto.setCreatorId(login.getClerkId());
         qdto.setCreatorName(login.getClerkFullName());
         qdto.setModifierId(login.getClerkId());
@@ -144,8 +143,6 @@ public class WelcomeController extends WebBaseController {
     public RestResponse<Boolean> saveFriendSetting(@RequestBody @Valid SaveFriendSettingQO qo) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         SaveFriendSettingQDTO qdto = EntityUtil.changeEntityNew(SaveFriendSettingQDTO.class, qo);
-        qdto.setUpdateId(login.getStaffId());
-        qdto.setUpdateName(login.getStaffName());
         ServiceResponse<Boolean> response = welcomeApiService.saveFriendSetting(qdto);
         return RestResponse.successResult(response.getResult());
     }