组织管理

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

@@ -22,7 +22,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("QW_COMCODE_DEPT")
+@TableName("qw_comcode_dept")
 public class QwComcodeDept implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("QW_SYS_DICT")
+@TableName("qw_sys_dict")
 public class QwSysDict implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,67 +33,67 @@ public class QwSysDict implements Serializable {
     /**
      * 字典类型
      */
-    @TableField("DICTTYPE")
+    @TableField("dicttype")
     private String dicttype;
 
     /**
      * 字典编码
      */
-    @TableField("DICTCODE")
+    @TableField("dictcode")
     private String dictcode;
 
     /**
      * 字典值
      */
-    @TableField("DICTVALUE")
+    @TableField("dictvalue")
     private String dictvalue;
 
     /**
      * 排序
      */
-    @TableField("DICTSORT")
+    @TableField("dictsort")
     private Long dictsort;
 
     /**
      * 状态 1有效 0无效
      */
-    @TableField("STATUS")
+    @TableField("status")
     private String status;
 
     /**
      * 创建时间
      */
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 创建人
      */
-    @TableField("CREATE_BY")
+    @TableField("createBy")
     private String createBy;
 
     /**
      * 是否默认（Y是 N否）
      */
-    @TableField("IS_DEFAULT")
+    @TableField("isDefault")
     private String isDefault;
 
     /**
      * 字典说明
      */
-    @TableField("DICTLABEL")
+    @TableField("dictlabel")
     private String dictlabel;
 
     /**
      * 备注
      */
-    @TableField("REMAKE")
+    @TableField("remake")
     private String remake;
 
     /**
      * 父级编码
      */
-    @TableField("PARENTDICTCODE")
+    @TableField("parentdictcode")
     private String parentdictcode;
 
 

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

@@ -22,7 +22,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("QW_USER_DEPT")
+@TableName("qw_user_dept")
 public class QwUserDept implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -17,6 +17,7 @@ import com.linkwechat.coal.modules.xxxt.system.mapper.QwSysDictMapper;
 import com.linkwechat.coal.modules.xxxt.system.mapper.QwUserDeptMapper;
 import com.linkwechat.coal.modules.xxxt.system.service.DictService;
 import com.linkwechat.coal.modules.xxxt.system.service.QwUserDeptService;
+import com.linkwechat.common.context.SecurityContextHolder;
 import com.linkwechat.common.core.domain.AjaxResult;
 import com.linkwechat.common.core.domain.entity.SysDept;
 import com.linkwechat.common.core.domain.entity.SysRole;

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

@@ -7,31 +7,31 @@
         <id column="ID" property="id" />
         <result column="DICTTYPE" property="dicttype" />
         <result column="DICTCODE" property="dictcode" />
-        <result column="DICTVALUE" property="dictvalue" />
-        <result column="DICTSORT" property="dictsort" />
-        <result column="STATUS" property="status" />
-        <result column="CREATE_TIME" property="createTime" />
-        <result column="CREATE_BY" property="createBy" />
-        <result column="IS_DEFAULT" property="isDefault" />
-        <result column="DICTLABEL" property="dictlabel" />
-        <result column="REMAKE" property="remake" />
-        <result column="PARENTDICTCODE" property="parentdictcode" />
+        <result column="dictvalue" property="dictvalue" />
+        <result column="dictsort" property="dictsort" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="is_default" property="isDefault" />
+        <result column="dictlabel" property="dictlabel" />
+        <result column="remake" property="remake" />
+        <result column="parentdictcode" property="parentdictcode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <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
             <include refid="Base_Column_List"/>,
-            (DICTCODE||'--'||DICTVALUE) as codevalue,
-            IS_DEFAULT as  isDefault
-        FROM QW_SYS_DICT
+            (dictcode||'--'||dictvalue) as codevalue,
+            is_default as  isDefault
+        FROM qw_sys_dict
         <where>
-            STATUS = '1'
+            status = '1'
             <if test="dicttype != null and dicttype !=''">
-                AND DICTTYPE = UPPER(#{dicttype})
+                AND dicttype = UPPER(#{dicttype})
             </if>
             <if test="dictvalue != null and dictvalue !=''">
                 AND dictvalue LIKE '%' || #{dictvalue} || '%'
@@ -50,16 +50,16 @@
 
             </if>
         </where>
-        ORDER BY DICTSORT ASC
+        ORDER BY dictsort ASC
     </select>
     <select id="selectAll" resultType="com.linkwechat.coal.modules.xxxt.system.domain.vo.DictVo">
         SELECT
         <include refid="Base_Column_List"/>,
-        (DICTCODE||'--'||DICTVALUE) as codevalue,
-        IS_DEFAULT as  isDefault
-        FROM QW_SYS_DICT
-        where STATUS = '1'
-        ORDER BY DICTTYPE,DICTSORT ASC
+        (dictcode||'--'||dictvalue) as codevalue,
+        is_default as isDefault
+        FROM qw_sys_dict
+        where status = '1'
+        ORDER BY dicttype,dictsort ASC
     </select>
 
 </mapper>