111

haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml

@@ -192,7 +192,7 @@
   <update id="deleteCode" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated" >
     update tab_haoban_staff_department_related
     set 
-      clerk_code = null
+      clerk_code = ''
       and update_time = #{updateTime,jdbcType=TIMESTAMP}
     where staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
   </update>

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

@@ -76,7 +76,7 @@ public class ClerkController extends WebBaseController{
 		if("1".equals(bindFlag)){
 			// 调陶接口获取详情数据
 			if(CollectionUtil.isNotEmpty(list)){
-				List<String> clerkCodes = list.stream().filter(s->s.getClerkCode()!=null).map(s->s.getClerkCode()).collect(Collectors.toList());
+				List<String> clerkCodes = list.stream().filter(s->StringUtils.isNotBlank(s.getClerkCode())).map(s->s.getClerkCode()).collect(Collectors.toList());
 				logger.info("clerkCodes =============>为{}",JSONObject.toJSONString(clerkCodes));
 				if(CollectionUtil.isNotEmpty(clerkCodes)){
 					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, true);
@@ -87,7 +87,7 @@ public class ClerkController extends WebBaseController{
 			//未绑定的clerk
 			// 调陶接口获取详情数据
 			if(CollectionUtil.isNotEmpty(list)){
-				List<String> clerkCodes = list.stream().filter(s->s.getClerkCode()!=null).map(s->s.getClerkCode()).collect(Collectors.toList());
+				List<String> clerkCodes = list.stream().filter(s->StringUtils.isNotBlank(s.getClerkCode())).map(s->s.getClerkCode()).collect(Collectors.toList());
 				if(CollectionUtil.isNotEmpty(clerkCodes)){
 					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
 					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);