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

src/main/java/org/rcisoft/business/bdictionary/dao/BDictionaryRepository.java

@@ -27,7 +27,8 @@ public interface BDictionaryRepository extends BaseMapper<BDictionary> {
             " and corp_id = #{curUser.corpId} "+
             " <if test=\"configList != null and configList.size()>0 \">and type in " +
             " <foreach item='item' index='index' collection='configList' open='(' separator=',' close=')'> #{item} </foreach> " +
-            " </if>"+
+            " </if> " +
+            "  order by sort"+
             " </script>")
     @ResultMap(value = "BaseResultMap" )
     List<BDictionary> findAllColumnConfig(@Param("curUser") CurUser curUser, @Param("configList") List<String> configList);

src/main/java/org/rcisoft/business/bdictionary/entity/BDictionary.java

@@ -30,6 +30,8 @@ public class BDictionary  extends IdEntity<BDictionary> {
 
      private String value;
 
+     private int sort;
+
 
 }
 

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -27,11 +27,11 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
      * @param
      * @return
      */
-    @Select("<script>select * from tm_admin_role " +
-            "where r_status = 1 " +
-            "and r_name not in ('主管理员') " +
-            "and corp_id = #{corpId} " +
-            " order by r_name desc </script>")
+    @Select("<script>select * from tm_admin_role  " +
+            "  where r_status = 1   " +
+            "  and r_type not in (1,0)   " +
+            "  and corp_id = #{corpId} " +
+            "  order by r_type desc , r_createdate asc</script>")
     @ResultMap(value = "SelectAllAndUserNum")
     List<SysRole> queryRoles(@Param("corpId") String corpId);
 

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -291,16 +291,19 @@ public class SysRoleServiceImpl implements SysRoleService {
         bDictionary1.setName("关注人数");
         bDictionary1.setType("GZRS");
         bDictionary1.setValue("5");
+        bDictionary1.setSort(1);
         UserUtil.setCurrentPersistOperation(bDictionary1);
         BDictionary bDictionary2 = new BDictionary();
         bDictionary2.setName("在学人数");
         bDictionary2.setType("ZXRS");
         bDictionary2.setValue("7");
+        bDictionary2.setSort(2);
         UserUtil.setCurrentPersistOperation(bDictionary2);
         BDictionary bDictionary3 = new BDictionary();
         bDictionary3.setName("总裁读书会");
         bDictionary3.setType("DSH");
         bDictionary3.setValue("http://www.winnerbook.com.cn/mobile/index.php?m=site");
+        bDictionary3.setSort(3);
         UserUtil.setCurrentPersistOperation(bDictionary3);
 
         dictionaryList.add(bDictionary1);

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -195,6 +195,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "WHERE " +
             "su.del_flag != 1 " +
             "AND su.flag = 1 " +
+            "and sm.del_flag != 1 " +
+            "and sm.flag = 1 " +
             "AND su.corp_id = #{corpId} " +
             "AND su.business_id = #{businessId} " +
             "AND sm.MODEL_ID = #{modelId} " +

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

@@ -74,14 +74,15 @@ public class SysUserServiceImpl implements SysUserService {
     public List<SysUser> qusers(QuerySysUserDTO dto) {
         //step1:调用外部接口 查询出 该部门下所有人（取id）
         if(dto.getDept()!=null){
-            List<Long> deptIds = new ArrayList<>();
+            List<String> deptIds = new ArrayList<>();
             StringBuffer stringBuffer = new StringBuffer();
             String ids = "";
-            deptIds.add(Long.parseLong(dto.getDept()));
-            List<MTGetUserByDeptIdsRspDTO> data = mtCotactApiRequestClient.userGetUserByDeptIds(dto.getCorpId(), deptIds);
+            deptIds.add(dto.getDept());
+            Set<String> deptSets = new HashSet<String>(deptIds);
+            List<String> data = mtCotactApiRequestClient.getSubUserIdsByDeptIds(dto.getCorpId(), deptSets);
             if(data != null ){
-                for (MTGetUserByDeptIdsRspDTO uid : data) {
-                    stringBuffer.append(uid.getId()+",");
+                for (String  uid : data) {
+                    stringBuffer.append(uid+",");
                 }
                 if (!stringBuffer.toString().equals("")) {
                     ids = stringBuffer.toString().substring(0, stringBuffer.toString().length() - 1);

src/main/resources/mapper/business/bdictionary/mapper/BDictionaryMapper.xml

@@ -13,6 +13,8 @@
             <result column="UPDATE_DATE" jdbcType="TIMESTAMP" property="updateDate"/>
             <result column="DEL_FLAG" jdbcType="VARCHAR" property="delFlag"/>
             <result column="FLAG" jdbcType="CHAR" property="flag"/>
+            <result column="corp_id" jdbcType="CHAR" property="corpId"/>
+            <result column="sort" jdbcType="VARCHAR" property="sort"/>
             <result column="REMARKS" jdbcType="VARCHAR" property="remarks"/>
     </resultMap>