Merge remote-tracking branch 'origin/meiteng' into zql

# Conflicts:
#	src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java
#	src/main/java/org/rcisoft/business/bpersonvalue/service/impl/BPersonValueServiceImpl.java

src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java

@@ -46,9 +46,10 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
      * @param personId
      * @return
      */
-    @Update("<script>update s_user set \n" +
-            "`value`=((select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 0 and person_id =  #{personId} )-\n" +
-            "(select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 1 and person_id =  #{personId} ))\n" +
+    @Update("<script> update s_user set \n" +
+            "`value`= " +
+            "((select IFNULL((select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 0 and person_id = #{personId}) ,0 )) -  " +
+            " (select IFNULL((select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 1 and person_id = #{personId}) ,0 )))" +
             ", lock_num = lock_num+1  " +
             "where business_id = #{personId} and corp_id  = #{corpId}" +
             "<if test=\" Integer !=null \"> and lock_num = lockNum </if> "+
@@ -61,8 +62,8 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
      * @param value
      * @return
      */
-    @Select("SELECT ((select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 0 and person_id = #{personId} )-" +
-            "(select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 1 and person_id = #{personId} )) - #{value}")
+    @Select("SELECT ((select IFNULL((select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 0 and person_id =  #{personId}) ,0 )) -" +
+            "(select IFNULL((select sum(`value`) from b_person_value where del_flag != 1 and flag = 1 and type = 1 and person_id =  #{personId}) ,0 ))) - #{value}")
     int judgeUserValue(@Param("personId")String personId,@Param("value")Integer value);
 
     /**

src/main/java/org/rcisoft/business/breleasevalue/dao/BReleaseValueRepository.java

@@ -80,11 +80,21 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
      * @param releaseId
      * @return
      */
-    @Select(" select su.name " +
+    @Select(" select su.name name " +
             " from b_release_value_son rvs " +
             " left join s_user su on su.business_id = rvs.user_id " +
             " where  rvs.release_id = #{releaseId} ")
     List<String> getNameforReleaseId(@Param("releaseId")String releaseId);
+    /**
+     * xml中查询关联用
+     * @param releaseId
+     * @return
+     */
+    @Select(" select su.name name,su.business_id id " +
+            " from b_release_value_son rvs " +
+            " left join s_user su on su.business_id = rvs.user_id " +
+            " where  rvs.release_id = #{releaseId} ")
+    List<UserListDto> getAllforReleaseId(@Param("releaseId")String releaseId);
 
     /**
      * 查询课程或培训积分设置
@@ -125,7 +135,7 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
      * @param userList
      * @return
      */
-    @Select("<script>select business_id businessId, name , `value`  ," +
+    @Select("<script>select business_id businessId, name , `value` value ," +
             "(select sum(`value`) from b_person_value where person_id = s_user.business_id and type = 0) valueGain " +
             " from s_user   " +
             " where 1=1   and del_flag !=1    and flag = 1  " +

src/main/java/org/rcisoft/business/breleasevalue/dto/UserListDto.java

+package org.rcisoft.business.breleasevalue.dto;
+
+import lombok.Data;
+
+@Data
+public class UserListDto {
+
+    public String id;
+
+    public String name;
+}

src/main/java/org/rcisoft/business/breleasevalue/entity/BReleaseValue.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.breleasevalue.entity;
 
 import lombok.*;
 
+import org.rcisoft.business.breleasevalue.dto.UserListDto;
 import org.rcisoft.core.entity.IdEntity;
 import javax.persistence.*;
 import java.math.BigDecimal;
@@ -20,8 +21,6 @@ import java.util.List;
 @Table(name = "b_release_value")
 public class BReleaseValue  extends IdEntity<BReleaseValue> {
 
-
-
      private String title;
 
      private Integer lessonValue;
@@ -32,6 +31,8 @@ public class BReleaseValue  extends IdEntity<BReleaseValue> {
 
      @Transient
      private List<String> userList;
+     @Transient
+     private List<UserListDto> userAllList;
 
 
 }

src/main/java/org/rcisoft/business/breleasevalue/service/impl/BReleaseValueServiceImpl.java

@@ -120,7 +120,7 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
     @Override
     public List<UserValueDto> queryUserValueByPagination(PageUtil pageUtil, UserValueResDto userValueResDto) {
         List<String> deptList = new ArrayList<>();
-        if(userValueResDto.getDept()!=null){
+        if(userValueResDto.getDept()!=null && !"".equals(userValueResDto.getDept())){
             Set<String> deptSets = new HashSet<>();
             deptSets.add(userValueResDto.getDept());
             deptList= mtCotactApiRequestClient.getSubUserIdsByDeptIds(userValueResDto.getCorpId(), deptSets);

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -60,8 +60,6 @@ public class SysUserServiceImpl implements SysUserService {
     @Autowired
     MTCotactApiRequestClient mtCotactApiRequestClient;
 
-
-
     @Autowired
     private Global global;
 
@@ -77,9 +75,10 @@ public class SysUserServiceImpl implements SysUserService {
      * @return
      */
     public List<SysUser> qusers(QuerySysUserDTO dto) {
+        dto.setType("0");
         //step1:调用外部接口 查询出 该部门下所有人（取id）
         if("0".equals(dto.getType())){                      //包含子部门
-            if(dto.getDept()!=null){
+            if(dto.getDept()!=null && !"".equals(dto.getDept()) ){
                 List<String> deptIds = new ArrayList<>();
                 deptIds.add(dto.getDept());
                 Set<String> deptSets = new HashSet<>(deptIds);
@@ -91,7 +90,7 @@ public class SysUserServiceImpl implements SysUserService {
                 }
             }
         }else{                                              //不包含子部门
-            if(dto.getDept()!=null){
+            if(dto.getDept()!=null && !"".equals(dto.getDept())){
                 List<Long> deptIds = new ArrayList<>();
                 deptIds.add(Long.parseLong(dto.getDept()));
                 List<MTGetUserByDeptIdsRspDTO> data = mtCotactApiRequestClient.userGetUserByDeptIds(dto.getCorpId(),deptIds);

src/main/resources/mapper/business/breleasevalue/mapper/BReleaseValueMapper.xml

@@ -18,6 +18,10 @@
                         javaType="java.util.ArrayList" select="org.rcisoft.business.breleasevalue.dao.BReleaseValueRepository.getNameforReleaseId"
                         column="business_id">
             </collection>
+            <collection property="userAllList" ofType="org.rcisoft.business.breleasevalue.entity.BReleaseValue"
+                        javaType="java.util.ArrayList" select="org.rcisoft.business.breleasevalue.dao.BReleaseValueRepository.getAllforReleaseId"
+                        column="business_id">
+            </collection>
     </resultMap>
 
 <!--        <resultMap id="UserValueDtoMap" type="org.rcisoft.business.breleasevalue.dto.UserValueDto">-->