Merge branch 'master' into docker_package

config/db/V8.3__add_table.sql

@@ -0,0 +1,13 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+drop table IF EXISTS `sys_audit_team`;
+create TABLE `sys_audit_team`  (
+  `id` bigint NOT NULL comment '主键ID',
+  `creator` bigint NOT NULL comment '创建人',
+  `create_date` datetime NOT NULL comment '创建时间',
+  `name` longtext NOT NULL comment '审核组名称',
+  `member` json NOT NULL comment '审核组成员id数组',
+  `index` varchar(255) NULL comment '审核组索引',
+  PRIMARY KEY (`id`)
+) comment = '流程审核组组员';
+SET FOREIGN_KEY_CHECKS = 1;

config/db/V8.3__tb_fuse_add_col.sql

@@ -1 +0,0 @@
-ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景';

config/db/V8.4__tb_fuse_add_col.sql

@@ -0,0 +1,2 @@
+ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景',
+    ADD COLUMN `area` varchar(128) NULL COMMENT '基层赋能场景所属地区';

config/db/V8.5__t_demand_data_add_col.sql

@@ -0,0 +1 @@
+ALTER TABLE `t_demand_data` ADD COLUMN `enclosure_name` longtext NULL COMMENT '附件名称' AFTER `apply_number`;

config/db/V8.6__audio_team_add_col.sql

@@ -0,0 +1 @@
+alter table `sys_audit_team` ADD COLUMN `description` longtext NULL comment '审核组备注信息';

renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java

@@ -219,6 +219,7 @@ public class HistoryController {
                 detailDTO.setExecutionId(task.getExecutionId());
                 detailDTO.setProcessDefinitionId(task.getProcessDefinitionId());
                 detailDTO.setComment("待审核");
+                detailDTO.setTaskId(task.getId());
                 final List<HistoryDetailDTO> taskHandleDetailInfo_ = new ArrayList<>();
                 taskHandleDetailInfo_.add(detailDTO);
                 taskHandleDetailInfo_.addAll(list);

renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java

@@ -339,7 +339,10 @@ public class ActTaskService extends BaseServiceImpl {
                         StringBuilder stringBuilder = new StringBuilder();
                         List<String> resourcesName = resourceDao.selectResourcesTypeByIds(resourceIds);
                         resourcesName.forEach(x -> stringBuilder.append(x).append(","));
-                        String string = stringBuilder.substring(0, stringBuilder.length() - 1);
+                        String string = "";
+                        if (stringBuilder.length() > 0) {
+                            string = stringBuilder.substring(0, stringBuilder.length() - 1);
+                        }
                         dto.setResourceType(string);
                     }, executor);
 

renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java

@@ -270,6 +270,8 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
         fuseEntity.setVisits(0L);
         fuseEntity.setApplyCount(0L);
         int result = fuseDao.insert(fuseEntity);
+
+        if (dto.getFuseResourceList() != null) {
             dto.getFuseResourceList().forEach(fuseResourceDTO -> {
                 fuseResourceDTO.setId(IdWorker.getId(fuseResourceDTO));
                 fuseResourceDTO.setFuseId(fuseEntity.getId());
@@ -277,6 +279,8 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
                 BeanUtils.copyProperties(fuseResourceDTO, entity);
                 fuseResourceDao.insert(entity);
             });
+        }
+        if (dto.getFuseAttrList() != null) {
             dto.getFuseAttrList().forEach(fuseAttrDTO -> {
                 fuseAttrDTO.setId(IdWorker.getId(fuseAttrDTO));
                 fuseAttrDTO.setFuseId(fuseEntity.getId());
@@ -284,6 +288,7 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
                 BeanUtils.copyProperties(fuseAttrDTO, entity);
                 fuseAttrDao.insert(entity);
             });
+        }
         return result;
     }