Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrg.java

@@ -50,7 +50,7 @@ public class SysOrg extends BaseEntity {
 
     @ApiModelProperty(value = "禁用")
     @TableField(value = "is_lock")
-    private Integer isLock;
+    private String isLock;
 
     @ApiModelProperty(value = "负责人")
     @TableField(value = "manager")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -35,7 +35,6 @@ import com.xunmei.core.edu.mapper.CoreEduTrainingPlanMapper;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToRoleMapper;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToUserMapper;
-import com.xunmei.core.edu.service.ICoreEduTrainingPlanService;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskToRoleService;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskToUserService;
@@ -46,7 +45,6 @@ import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -209,12 +207,16 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
         CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
         taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
-        BeanUtils.copyProperties(request, coreEduTrainingTask);
+        coreEduTrainingTask.setType(request.getType());
+        coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
+        coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingEndDateTime());
+        coreEduTrainingTask.setContent(request.getContent());
+        coreEduTrainingTask.setNote(request.getNote());
         coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());
         //主持人默认取网点负责人,具体还没落实,暂时处理成这样   TODO
         coreEduTrainingTask.setHostId(SecurityUtils.getUserId());
         List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
-        if (taskUserList != null && taskUserList.size() > 0) {
+        if (ObjectUtil.isNotEmpty(taskUserList)) {
             for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {
                 taskToUser.setEduTrainingTaskId(request.getId());
                 taskToUser.setSign(0);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -220,7 +220,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         ;
         for (TMonitoringRetrievalPlan plan : planList) {
             //获取计划关联的机构
-            List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock() == 0).collect(Collectors.toList());
+            List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock().equals("0")).collect(Collectors.toList());
             if (CollectionUtil.isNotEmpty(listByType)) {
                 List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, taskTime, listByType.get(0));
                 if (CollectionUtil.isNotEmpty(list)) {
@@ -363,7 +363,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         //按计划生成任务
         for (TMonitoringRetrievalPlan plan : planList) {
             //获取计划关联的机构
-            List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock() == 0).collect(Collectors.toList());
+            List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock().equals("0")).collect(Collectors.toList());
             if (CollectionUtil.isNotEmpty(listByType)) {
                 List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, taskTime, listByType.get(0));
                 if (CollectionUtil.isNotEmpty(list)) {

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/impl/FJNXSyncServiceImpl.java

@@ -383,7 +383,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
 //        org.setLevel(fjnxOrgDto.getOrgPath().split("/").length);
         // TODO 机构状态和机构类型转换
         //org.setIsLock(fjnxOrgDto.getUsableFlag());
-        org.setIsLock(fjnxOrgDto.getUsableFlag());
+        org.setIsLock(fjnxOrgDto.getUsableFlag().toString());
         return org;
 
     }
@@ -412,7 +412,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
         org.setUpdateTime(fjnxOrgDto.getUpdateTime());
         org.setRemark(fjnxOrgDto.getRemark());
         //org.setLevel(fjnxOrgDto.getOrgPath().split("/").length);
-        org.setIsLock(fjnxOrgDto.getUsableFlag());
+        org.setIsLock(fjnxOrgDto.getUsableFlag().toString());
         org.setDeleted(0);
         org.setSource(1);
         // todo 机构类型转换
@@ -490,7 +490,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
         org.setRemark(fjnxOrg.getRemark());
 //        org.setLevel(fjnxOrg.getOrgPath().split("/").length);
         // TODO 机构状态和机构类型转换
-        org.setIsLock(fjnxOrg.getUsableFlag());
+        org.setIsLock(fjnxOrg.getUsableFlag().toString());
         org.setSource(1);
         return org;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -43,7 +43,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     private SysUserMapper sysUserMapper;
 
 
-
     /**
      * 项目启动时，缓存机构数据
      */
@@ -65,7 +64,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             page = new Page<>();
         }
         Long parentId = org.getParentId();
-        if(parentId == null){
+        if (parentId == null) {
             parentId = SecurityUtils.getLoginUser().getSysUser().getOrgId();
         }
         SysOrg sysOrg = sysOrgMapper.selectById(parentId);
@@ -77,7 +76,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         if (org.getCheckSub()) {
             query.lambda().likeRight(SysOrg::getPath, sysOrg.getPath());
         } else {
-            query.lambda().eq(SysOrg::getPath,sysOrg.getPath());
+            query.lambda().eq(SysOrg::getPath, sysOrg.getPath());
         }
         //模糊查询
         if (StringUtils.isNotNull(org.getName())) {
@@ -264,6 +263,9 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     public boolean saveOrUpdateOrg(SysOrg org) {
         boolean isOk = false;
         if (org.getId() != null) {
+            if (StringUtils.isEmpty(org.getManagerPhone())) {
+                org.setManagerPhone(org.getPhone());
+            }
             isOk = this.updateById(org);
         } else {
             SysOrg sysOrg = sysOrgMapper.selectById(org.getParentId());
@@ -271,7 +273,10 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             org.setDeleted(0);
             long id = IdWorker.getId();
             org.setId(id);
-            org.setPath(sysOrg.getPath()+id+"-");
+            org.setPath(sysOrg.getPath() + id + "-");
+            if (StringUtils.isEmpty(org.getManagerPhone())) {
+                org.setManagerPhone(org.getPhone());
+            }
             isOk = this.save(org);
         }
         /*

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -64,6 +64,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             page = new Page<>();
         }
         SysRole sysRole = new SysRole();
+        sysRole.setStatus(role.getStatus());
         QueryWrapper<SysRole> query = new QueryWrapper<>(sysRole);
         query.eq("del_flag", 0);
         if (null != role.getRoleKey()) {

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.xunmei.system.mapper.SysRoleMapper">
 
 	<resultMap type="com.xunmei.system.api.domain.SysRole" id="SysRoleResult">
-		<id     property="roleId"             column="role_id"               />
+		<id     property="id"             column="id"               />
 		<result property="roleName"           column="role_name"             />
 		<result property="roleKey"            column="role_key"              />
 		<result property="roleSort"           column="role_sort"             />
@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
  			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
  			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
- 			<if test="status != null and status != ''">0,</if>
+ 			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			sysdate()