企业标签

yudao-dependencies/pom.xml

@@ -525,7 +525,6 @@
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>${guice.version}</version>
             </dependency>
 
             <dependency>
@@ -583,11 +582,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>com.github.binarywang</groupId>
-                <artifactId>weixin-java-pay</artifactId>
-                <version>${weixin-java.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.binarywang</groupId>
                 <artifactId>wx-java-mp-spring-boot-starter</artifactId>
@@ -599,26 +593,6 @@
                 <version>${weixin-java.version}</version>
             </dependency>
 
-            <!-- 积木报表-->
-            <dependency>
-                <groupId>org.jeecgframework.jimureport</groupId>
-                <artifactId>jimureport-spring-boot-starter</artifactId>
-                <version>${jimureport.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.alibaba</groupId>
-                        <artifactId>druid</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <!-- MQTT -->
-            <dependency>
-                <groupId>org.eclipse.paho</groupId>
-                <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-                <version>${mqtt.version}</version>
-            </dependency>
-
             <!-- 专属于 JDK8 安全漏洞升级 -->
             <dependency>
                 <groupId>ch.qos.logback</groupId>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java

@@ -90,24 +90,26 @@ public class EnterpriseController {
 //    @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
     public CommonResult<EnterpriseRespVO> getEnterprise(@RequestParam("id") Long id) {
         EnterpriseDO enterprise = enterpriseService.getEnterprise(id);
+        if (enterprise != null) {
+            LambdaQueryWrapper<FileInfoDO> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(FileInfoDO::getDictType, 644l);
+            wrapper.eq(FileInfoDO::getDictData, 1l);
+            wrapper.eq(FileInfoDO::getUnitId, enterprise.getId());
+            final List<Long> collect = fileInfoMapper.selectList(wrapper).stream().map(res -> res.getInfraFileId()).collect(Collectors.toList());
 
-        //获取企业图片
-        LambdaQueryWrapper<FileInfoDO> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(FileInfoDO::getDictType, 644l);
-        wrapper.eq(FileInfoDO::getDictData, 1l);
-        wrapper.eq(FileInfoDO::getUnitId, enterprise.getId());
-        final List<Long> collect = fileInfoMapper.selectList(wrapper).stream().map(res -> res.getInfraFileId()).collect(Collectors.toList());
-
-        if (!collect.isEmpty()) {
-            final List<String> list = fileApi.listFile(collect);
-            enterprise.setFiles(list);
+            if (!collect.isEmpty()) {
+                final List<String> list = fileApi.listFile(collect);
+                enterprise.setFiles(list);
+            }
+
+            //获取资质
+            LambdaQueryWrapper<EnterpriseQualificationDO> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(EnterpriseQualificationDO::getEnterpriseId, enterprise.getId());
+            final List<EnterpriseQualificationDO> enterpriseQualificationList = enterpriseQualificationMapper.selectList(queryWrapper);
+            enterprise.setQualificationList(enterpriseQualificationList);
         }
+        //获取企业图片
 
-        //获取资质
-        LambdaQueryWrapper<EnterpriseQualificationDO> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EnterpriseQualificationDO::getEnterpriseId, enterprise.getId());
-        final List<EnterpriseQualificationDO> enterpriseQualificationList = enterpriseQualificationMapper.selectList(queryWrapper);
-        enterprise.setQualificationList(enterpriseQualificationList);
 
         return success(BeanUtils.toBean(enterprise, EnterpriseRespVO.class));
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java

@@ -33,6 +33,10 @@ public class TagLibraryRespVO {
     @ExcelProperty("1、企业标签2、执法标签")
     private Integer tagType;
 
+    @Schema(description = "排序", example = "2")
+    @ExcelProperty("排序")
+    private Integer sort;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibrarySaveReqVO.java

@@ -21,10 +21,12 @@ public class TagLibrarySaveReqVO {
     @Schema(description = "父标签的ID", example = "30648")
     private Integer parentId;
 
-    @Schema(description = "标签层级（一级、二级、三级）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "标签层级（一级、二级、三级）不能为空")
+    @Schema(description = "标签层级（一级、二级、三级）")
     private Integer tagLevel;
 
+    @Schema(description = "排序")
+    private Integer sort;
+
     @Schema(description = "1、企业标签2、执法标签", example = "2")
     private Integer tagType;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/taglibrary/TagLibraryDO.java

@@ -43,6 +43,8 @@ public class TagLibraryDO extends BaseDO {
      * 1、企业标签2、执法标签
      */
     private Integer tagType;
+    //排序
+    private Integer sort;
 
     @TableField(exist = false)
     private List<TagLibraryDO> children = new ArrayList<>(); // 子标签列表

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java

@@ -24,7 +24,7 @@ public interface TagLibraryMapper extends BaseMapperX<TagLibraryDO> {
                 .eqIfPresent(TagLibraryDO::getTagLevel, reqVO.getTagLevel())
                 .eqIfPresent(TagLibraryDO::getTagType, reqVO.getTagType())
                 .betweenIfPresent(TagLibraryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(TagLibraryDO::getId));
+                .orderByDesc(TagLibraryDO::getSort));
     }
 
 }