组织管理

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/xxxt/system/domain/entity/QwSysDict.java

@@ -27,7 +27,7 @@ public class QwSysDict implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/xxxt/system/domain/entity/QwUserDept.java

@@ -30,55 +30,55 @@ public class QwUserDept implements Serializable {
     /**
      * 用户ID(企业微信的用户ID)
      */
-    @TableId(value = "USER_ID",type = IdType.INPUT)
+    @TableId(value = "user_id",type = IdType.INPUT)
     private String userId;
 
     /**
      * 用户名称
      */
-    @TableField("USER_NAME")
+    @TableField("user_name")
     private String userName;
 
     /**
      * 归属机构(中煤机构)
      */
-    @TableField("COMCODE")
+    @TableField("comcode")
     private String comcode;
 
     /**
      * 是否有效
      */
-    @TableField("VALIDSTATUS")
+    @TableField("validstatus")
     private String validstatus;
 
     /**
      * 操作人
      */
-    @TableField("UPDATE_BY")
+    @TableField("update_by")
     private String updateBy;
 
     /**
      * 操作时间
      */
-    @TableField("UPDATE_DATE")
+    @TableField("update_date")
     private Date updateDate;
 
     /**
      * 创建人
      */
-    @TableField("CREATE_BY")
+    @TableField("create_by")
     private String createBy;
 
     /**
      * 创建时间
      */
-    @TableField("CREATE_DATE")
+    @TableField("create_date")
     private Date createDate;
 
     /**
      * 不查询的机构，多个机构以英文,拼接
      */
-    @TableField("COMCODE_NOTIN")
+    @TableField("comcode_notin")
     private String comcodeNotin;
 
 

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/xxxt/system/service/impl/DictServiceImpl.java

@@ -168,44 +168,44 @@ public class DictServiceImpl implements DictService {
                     System.out.println(JSON.toJSON(dictList));
                     break;
                 case "COMCODE":
-                    DictVo vo = null;
-                    if (StringUtils.isNotBlank(comcode)) {
-                        dto.setDictcode(comcode);
-                        // 查询父节点
-                        DictDto dto1 = new DictDto();
-                        dto1.setComcode(comcode);
-                        dto1.setDicttype(dto.getDicttype());
-                        vo = dictMapper.selectParentcomcode(dto1);
-                    } else {
-                        throw new SystemException("该用户未配置归属机构！");
-                    }
-
-                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
-                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
-                        dto.setComcodeNotin(collect);
-                    }
-                    List<DictVo> sacompanies = dictMapper.selectSacompany(dto);
-                    if (vo != null) {
-                        sacompanies.add(vo);
-                        // 设置父节点
-                        dto.setDictcode(vo.getDictcode());
-                    } else {
-                        if (StringUtils.isNotBlank(comcode)) {
-                            if (DeptConstant.COMCODE_00.equals(comcode)) {
-                                // 总公司时设置父节点
-                                dto.setDictcode(DeptConstant.COMCODE_1);
-                            }
-                        }
-                    }
-                    //获取父节点数据
-                    dictList = sacompanies.stream().filter(m -> m.getParentId().equals(StringUtils.isEmpty(dto.getDictcode()) ? DeptConstant.COMCODE_1 : dto.getDictcode())).map(
-                            (m) -> {
-                                m.setChildList(getChildrens(m, sacompanies));
-                                return m;
-                            }
-                    ).collect(Collectors.toList());
-                    System.out.println("-------转换输出json结果-------");
-                    System.out.println(JSON.toJSON(dictList));
+//                    DictVo vo = null;
+//                    if (StringUtils.isNotBlank(comcode)) {
+//                        dto.setDictcode(comcode);
+//                        // 查询父节点
+//                        DictDto dto1 = new DictDto();
+//                        dto1.setComcode(comcode);
+//                        dto1.setDicttype(dto.getDicttype());
+//                        vo = dictMapper.selectParentcomcode(dto1);
+//                    } else {
+//                        throw new SystemException("该用户未配置归属机构！");
+//                    }
+//
+//                    if (StringUtils.isNotBlank(userDept.getComcodeNotin())) {
+//                        List<String> collect = Arrays.stream(userDept.getComcodeNotin().split(",")).collect(Collectors.toList());
+//                        dto.setComcodeNotin(collect);
+//                    }
+//                    List<DictVo> sacompanies = dictMapper.selectSacompany(dto);
+//                    if (vo != null) {
+//                        sacompanies.add(vo);
+//                        // 设置父节点
+//                        dto.setDictcode(vo.getDictcode());
+//                    } else {
+//                        if (StringUtils.isNotBlank(comcode)) {
+//                            if (DeptConstant.COMCODE_00.equals(comcode)) {
+//                                // 总公司时设置父节点
+//                                dto.setDictcode(DeptConstant.COMCODE_1);
+//                            }
+//                        }
+//                    }
+//                    //获取父节点数据
+//                    dictList = sacompanies.stream().filter(m -> m.getParentId().equals(StringUtils.isEmpty(dto.getDictcode()) ? DeptConstant.COMCODE_1 : dto.getDictcode())).map(
+//                            (m) -> {
+//                                m.setChildList(getChildrens(m, sacompanies));
+//                                return m;
+//                            }
+//                    ).collect(Collectors.toList());
+//                    System.out.println("-------转换输出json结果-------");
+//                    System.out.println(JSON.toJSON(dictList));
                     break;
                 case "COM3CODE":
                     DictVo vo3 = null;

linkwe-chinacoal/src/main/resources/mapper/modules/xxxt/system/QwSysDictMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.linkwechat.coal.modules.xxxt.system.domain.entity.QwSysDict">
-        <id column="ID" property="id" />
+        <id column="id" property="id" />
         <result column="DICTTYPE" property="dicttype" />
         <result column="DICTCODE" property="dictcode" />
         <result column="dictvalue" property="dictvalue" />
@@ -20,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, dicttype, dictcode, dictvalue, dictsort, status, create_time, create_by, is_default, dictlabel, remake, PARENTDICTCODE
+        id, dicttype, dictcode, dictvalue, dictsort, status, create_time, create_by, is_default, dictlabel, remake, PARENTDICTCODE
     </sql>
     <select id="select" resultType="com.linkwechat.coal.modules.xxxt.system.domain.vo.DictVo">
         SELECT