Merge remote-tracking branch 'origin/dev_govgrid' into dev

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java

@@ -26,6 +26,6 @@ public class AddDepartmentStaffFormDTO implements Serializable {
      * 选中人员id
      */
     @NotBlank(message = "选中人员不能为空")
-    private List selectedList;
+    private List<String> selectedList;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.result.DepartmentListResultDTO;
 import com.epmet.dto.result.SubListResultDTO;
 import com.epmet.entity.CustomerDepartmentEntity;
@@ -56,4 +57,12 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
      * @return
      */
     List<DepartmentListResultDTO> listDepartmentListByStaffId(@Param("staffId") String staffId);
+
+    /**
+     * @Description 根据departmentId查询customerId
+    * @param departmentId
+     * @author zxc
+     * @date 2020/4/28 12:26
+     */
+    CustomerIdDTO selectCustomerIdByDepartmentId(@Param("departmentId") String departmentId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -222,20 +222,16 @@ public class DepartmentServiceImpl implements DepartmentService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result addDepartmentStaff(TokenDto tokenDto,AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
-        CustomerStaffDepartmentEntity customerStaffDepartmentEntity = new CustomerStaffDepartmentEntity();
+
-        Result<List<CustomerIdDTO>> listResult = epmetUserFeignClient.selectCustomerIdByUserId(addDepartmentStaffFormDTO);
+        CustomerIdDTO customerIdDTO = customerDepartmentDao.selectCustomerIdByDepartmentId(addDepartmentStaffFormDTO.getDepartmentId());
-        List<CustomerIdDTO> data = listResult.getData();
+        for (String userId : addDepartmentStaffFormDTO.getSelectedList()) {
-        customerStaffDepartmentEntity.setDepartmentId(addDepartmentStaffFormDTO.getDepartmentId());
+            CustomerStaffDepartmentEntity customerStaffDepartmentEntity = new CustomerStaffDepartmentEntity();
-        customerStaffDepartmentEntity.setCreatedBy(tokenDto.getUserId());
+            customerStaffDepartmentEntity.setDepartmentId(addDepartmentStaffFormDTO.getDepartmentId());
-        customerStaffDepartmentEntity.setUpdatedBy(tokenDto.getUserId());
-        customerStaffDepartmentEntity.setDelFlag("0");
-        customerStaffDepartmentEntity.setRevision(0);
-        for (CustomerIdDTO customerIdDTO : data) {
-            customerStaffDepartmentEntity.setUserId(customerIdDTO.getUserId());
             customerStaffDepartmentEntity.setCustomerId(customerIdDTO.getCustomerId());
+            customerStaffDepartmentEntity.setUserId(userId);
             customerStaffDepartmentDao.insert(customerStaffDepartmentEntity);
         }
-        customerStaffDepartmentDao.updateDepartmentStaffCount(data.size(),addDepartmentStaffFormDTO.getDepartmentId());
+        customerStaffDepartmentDao.updateDepartmentStaffCount(addDepartmentStaffFormDTO.getSelectedList().size(),addDepartmentStaffFormDTO.getDepartmentId());
         return new Result();
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -33,4 +33,15 @@
                inner join customer_department cd on (csd.DEPARTMENT_ID = cd.ID)
         where csd.USER_ID = #{staffId}
     </select>
+
+    <!-- 根据部门id查询customerId -->
+    <select id="selectCustomerIdByDepartmentId" resultType="com.epmet.dto.CustomerIdDTO">
+        SELECT
+	        customer_id AS customerId
+        FROM
+            customer_department
+        WHERE
+            id = #{departmentId}
+            AND del_flag = 0
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -27,10 +27,10 @@
     <!-- 根据userId查询网格下的用户信息 -->
     <select id="selectStaffGridListByUserId" parameterType="com.epmet.dto.CustomerStaffGridDTO" resultType="com.epmet.dto.StaffGridListDTO">
         SELECT
-            cs.id AS staffId,
+            cs.user_id AS staffId,
             cs.real_name AS staffName,
-            cs.head_photo AS staffHeadPhoto,
+            IFNULL(cs.head_photo,'') AS staffHeadPhoto,
-            gsr.role_name AS roleName,
+            IFNULL(gsr.role_name,'') AS roleName,
             cs.gender
         FROM
             customer_staff cs