删除接口

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

@@ -97,6 +97,7 @@ public class PayController extends WebBaseController {
                 if (null != store) {
                     staffClerkInfoVo.setStoreCode(store.getStoreCode());
                 }
+                staffClerkInfoVo.setWxEnterpriseName(enterpriseDTO.getCorpName());
             });
         }
         return resultResponse(HaoBanErrCode.ERR_1,infoVos);

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/StaffClerkInfoVo.java

@@ -12,6 +12,8 @@ public class StaffClerkInfoVo implements Serializable{
 
     private String wxEnterpriseId;
 
+    private String wxEnterpriseName;
+
     private String wxUserId;
 
     private String enterpriseId;
@@ -42,6 +44,14 @@ public class StaffClerkInfoVo implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
+    public String getWxEnterpriseName() {
+        return wxEnterpriseName;
+    }
+
+    public void setWxEnterpriseName(String wxEnterpriseName) {
+        this.wxEnterpriseName = wxEnterpriseName;
+    }
+
     public String getStoreCode() {
         return storeCode;
     }

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

@@ -106,17 +106,17 @@ public class StaffController extends WebBaseController{
 	public HaobanResponse staffList(String departmentId,Integer activeFlag,String keyWord,BasePageInfo pageInfo){
 		Page<StaffDTO> page = staffApiService.pageStaff(departmentId,activeFlag,keyWord,pageInfo);
 		List<StaffDTO> list = page.getResult();
-		if(list != null) {
-			for (StaffDTO staffDTO : list) {
-				logger.info("【成员列表】departmentId={},staffId={}",departmentId,staffDTO.getStaffId());
-				StaffDepartmentRelatedDTO related = staffApiService.getDepartmentIdAndStaffId(departmentId,staffDTO.getStaffId());
-				logger.info("【成员列表】related={}",JSON.toJSONString(related));
-				if(related != null) {
-					staffDTO.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
-					staffDTO.setClerkCode(related.getClerkCode());
-				}
-			}
-		}
+//		if(list != null) {
+//			for (StaffDTO staffDTO : list) {
+//				logger.info("【成员列表】departmentId={},staffId={}",departmentId,staffDTO.getStaffId());
+//				StaffDepartmentRelatedDTO related = staffApiService.getDepartmentIdAndStaffId(departmentId,staffDTO.getStaffId());
+//				logger.info("【成员列表】related={}",JSON.toJSONString(related));
+//				if(related != null) {
+//					staffDTO.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
+//					staffDTO.setClerkCode(related.getClerkCode());
+//				}
+//			}
+//		}
 		
 		logger.info("【员工列表】page={}",JSON.toJSONString(page));
 		PageResult<StaffDTO> pageVo = new PageResult<>();