helixiao 11 ماه پیش
والد
کامیت
2ad008458f

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

@@ -20,8 +20,6 @@ import java.util.Date;
  * @since 2023-11-27
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @TableName("qw_comcode_dept")
 public class QwComcodeDept implements Serializable {
 

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

@@ -17,8 +17,6 @@ import java.util.Date;
  * @since 2023-09-14
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @TableName("qw_sys_dict")
 public class QwSysDict implements Serializable {
 

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

@@ -20,8 +20,6 @@ import java.util.Date;
  * @since 2023-10-23
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @TableName("qw_user_dept")
 public class QwUserDept implements Serializable {
 

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

@@ -77,17 +77,17 @@ public class DictServiceImpl implements DictService {
      */
     @Override
     public AjaxResult<DictVo> select(DictDto dto) {
-        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-        // 查询配置机构
-        String comcode = qwUserDeptService.selectByUserid();
-
-        QwUserDept userDept = qwUserDeptMapper.selectOne(new LambdaQueryWrapper<QwUserDept>().eq(QwUserDept::getUserId, sysUser.getUserId())
-                .eq(QwUserDept::getValidstatus, "1"));
-        // 车牌单独处理下再查询
-        if (StringUtils.isNotBlank(dto.getComcode()) && "LISENSENO".equalsIgnoreCase(dto.getDicttype())) {
-            dto.setDfComcode(dto.getComcode().length() > 2 ? dto.getComcode().substring(0, 2) : dto.getComcode());
-        }
-        List<DictVo> dictList = qwSysDictMapper.select(dto);
+//        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+//        // 查询配置机构
+//        String comcode = qwUserDeptService.selectByUserid();
+//
+//        QwUserDept userDept = qwUserDeptMapper.selectOne(new LambdaQueryWrapper<QwUserDept>().eq(QwUserDept::getUserId, sysUser.getUserId())
+//                .eq(QwUserDept::getValidstatus, "1"));
+//        // 车牌单独处理下再查询
+//        if (StringUtils.isNotBlank(dto.getComcode()) && "LISENSENO".equalsIgnoreCase(dto.getDicttype())) {
+//            dto.setDfComcode(dto.getComcode().length() > 2 ? dto.getComcode().substring(0, 2) : dto.getComcode());
+//        }
+//        List<DictVo> dictList = qwSysDictMapper.select(dto);
 //        if (CollectionUtils.isEmpty(dictList)) {
 //            switch (dto.getDicttype().toUpperCase()) {
 //                case "QW_BY_DEPTID_GET_CHILD_USERID":
@@ -330,7 +330,7 @@ public class DictServiceImpl implements DictService {
 //        }
 
 
-        return AjaxResult.success(dictList);
+        return AjaxResult.success(null);
     }
 
     private List<DictVo> getDictVos(SysDept dept) {

+ 0 - 8
linkwe-chinacoal/src/main/resources/mapper/modules/xxxt/system/QwComcodeDeptMapper.xml

@@ -24,14 +24,6 @@
         SELECT <include refid="Base_Column_List"/>
         FROM QW_COMCODE_DEPT A
         WHERE A.COMCODE=#{comcode}
-        AND A.COMCODE IN (
-            select comcode
-            from SaCompany@dblink_sales
-            where validstatus = '1'
-            start with comcode = #{dfComcode}
-            connect by prior comcode = uppercomcode
-            and prior comcode != comcode
-        )
     </select>
     <select id="selectByDeptIdLike" resultType="com.linkwechat.coal.modules.xxxt.system.domain.entity.QwComcodeDept">
         SELECT <include refid="Base_Column_List"/>

+ 1 - 3
linkwe-chinacoal/src/main/resources/mapper/modules/xxxt/system/QwUserDeptMapper.xml

@@ -20,9 +20,7 @@
         user_id, user_name, comcode, validstatus, update_by, update_date, create_by, create_date,comcode_notin
     </sql>
     <select id="selectCom" resultType="java.util.Map">
-        SELECT a.comcode,b.COMCNAME
+        SELECT a.comcode
         from qw_user_dept a
-        join SaCompany@dblink_sales b on a.comcode=b.comcode
-        where a.user_id=#{userId}
     </select>
 </mapper>