Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java

@@ -15,7 +15,7 @@ public interface AuditApiService {
 	
 	Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId,String enterpriseId,Integer auditStatus,Integer auditFlag,BasePageInfo pageInfo);
 	
-	String audit(String batchId,String auditId,String aduitName);
+	String audit(String batchId,String auditId,String aduitName,String optStaffId);
 	
 	void refuse(String auditId,String auditReason,String aduitName);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -157,7 +157,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 	}
 	@Transactional
 	@Override
-	public String audit(String batchId,String auditId,String auditName) {
+	public String audit(String batchId,String auditId,String auditName,String optStaffId) {
 		TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId);
 		if(tab==null){
 			return "审核项目不存在";
@@ -222,7 +222,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
 				staffClerkRelation.setWxUserId(obj.getWxUserId());
 				staffClerkRelation.setStaffId(obj.getStaffId());
-				staffClerkRelationApiService.delAndInsert(staffClerkRelation,tab.getCommitStaffId(), ChannelCodeEnum.AUDIT_BIND.getCode());
+				staffClerkRelationApiService.delAndInsert(staffClerkRelation,optStaffId, ChannelCodeEnum.AUDIT_BIND.getCode());
 			}
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(), tab);
@@ -262,7 +262,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			//解绑日志
 			StaffClerkRelationDTO relationDTO = staffClerkRelationApiService.getByClerkId(obj.getClerkId());
 			if (null != relationDTO) {
-				staffClerkRelationApiService.pushToBindLog(relationDTO.getStaffId(),tab.getCommitStaffId(),BindTypeEnum.UNBIND.getVal(),ChannelCodeEnum.SELF_UNBIND.getCode(),relationDTO.getStaffClerkRelationId());
+				staffClerkRelationApiService.pushToBindLog(relationDTO.getStaffId(),optStaffId,BindTypeEnum.UNBIND.getVal(),ChannelCodeEnum.SELF_UNBIND.getCode(),relationDTO.getStaffClerkRelationId());
 			}
 			staffClerkRelationApiService.delByClerkId(obj.getClerkId());
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, "");

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

@@ -16,7 +16,9 @@ import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.AuditSettingApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.web.anno.HttpLimit;
+import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.vo.BatchApproveVO;
+import com.gic.haoban.manage.web.vo.LoginVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -158,6 +160,11 @@ public class AuditController extends WebBaseController{
 	@HttpLimit
 	@RequestMapping("batch-approve")
 	public HaobanResponse batchApprove(String auditIds,String auditName ) {
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		StaffDTO loginStaffDTO = login.getStaffDTO();
+		if (null == loginStaffDTO) {
+			return resultResponse(HaoBanErrCode.ERR_4);
+		}
 		if(StringUtils.isAnyBlank(auditIds,auditName)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
@@ -166,7 +173,7 @@ public class AuditController extends WebBaseController{
 		int failCount = 0;
 		String batchId = UuidUtil.randomUUID();
 		for(String auditId : s){
-			String result = auditApiService.audit(batchId,auditId,auditName);
+			String result = auditApiService.audit(batchId,auditId,auditName,loginStaffDTO.getStaffId());
 			if(StringUtils.isEmpty(result)){
 				successCount = successCount+1;
 			}else{
@@ -194,10 +201,15 @@ public class AuditController extends WebBaseController{
 	@HttpLimit
 	@RequestMapping("audit")
 	public HaobanResponse audit(String auditId,String auditName ) {
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		StaffDTO loginStaffDTO = login.getStaffDTO();
+		if (null == loginStaffDTO) {
+			return resultResponse(HaoBanErrCode.ERR_4);
+		}
 		if(StringUtils.isAnyBlank(auditId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		String result = auditApiService.audit("",auditId,auditName);
+		String result = auditApiService.audit("",auditId,auditName,loginStaffDTO.getStaffId());
 		if(StringUtils.isEmpty(result)){
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}else{