From f3101d6e74b4904da5c2d335108adcd007c048f0 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 20 Jan 2022 15:07:55 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BAtextStatu?=
 =?UTF-8?q?sBussShow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarBussionessStand/entity/SarBussionessStand.java  | 3 +++
 .../mapper/sarBussionessStand/SarBussionessStandMapper.xml  | 4 +++-
 .../com/adc/da/sys/controller/DicTypeEORestController.java  | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
index 7b663965..2d6502fe 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
@@ -153,6 +153,9 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private String menuParentId;
 
+    @TableField(exist = false)
+    private String textStatusBussShow;
+
     @TableField(exist = false)
     private String standStatusShow; // 标准状态下拉框   --单选
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index 38a70316..7abb5fd4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -21,6 +21,7 @@
         <result column="stand_sort" property="standSort" />
         <result column="stand_year" property="standYear" />
         <result column="text_status_buss" property="textStatusBuss" />
+        <result column="text_status_buss_show" property="textStatusBussShow"/>
     </resultMap>
 
     <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -748,12 +749,13 @@
 
     <!-- 根据id查询 SAR_BUSSIONESS_STAND 的详细信息-->
     <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select <include refid="Base_Column_List_show" />
+        select <include refid="Base_Column_List_show" />,dictextstatus.DIC_TYPE_NAME as text_status_buss_show
         from SAR_BUSSIONESS_STAND
         left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
         left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
         left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
         left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
+        left join TS_DICTYPE dictextstatus ON ( dictextstatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandSort.dic_id IS NOT NULL and dictextstatus.valid_flag = 0)
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
         left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         where SAR_BUSSIONESS_STAND.id = #{id}
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
index 3f1560e4..e58f8e60 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
@@ -340,8 +340,10 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
     @GetMapping("/getDicTypeListCode")
     //@RequiresPermissions("sys:dicType:getDicTypeListCode")
     public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
-        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
-        return Result.success(dicTypeEO);
+
+        return Result.success("1","hello");
+//        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
+//        return Result.success(dicTypeEO);
     }
 
     /**

From eb15c06699bef7b484101c40cc23c1913aa1ed7b Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 20 Jan 2022 17:19:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customWorkGroup/controller/WorkGroupController.java     | 2 +-
 .../customWorkGroup/service/impl/WorkGroupServiceImpl.java  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
index 7685ce67..a138ed68 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
@@ -57,7 +57,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
 
 
 
-    @ApiModelProperty("删除工作组")
+    @ApiModelProperty("批量删除工作组")
     @DeleteMapping
     public ResponseMessage deleteWorkGroup(String id){
         boolean delete = iWorkGroupService.delete(id);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
index ae37be0d..297b092a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -36,7 +39,8 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
 
     @Override
     public boolean delete(String workGroupId) {
-        return this.removeById(workGroupId);
+        List<String> idList = Arrays.asList(workGroupId.split(","));
+        return this.removeByIds(idList);
     }
 
     @Override

From c239ad7c993e6216ca6a9ab210575865bc9fa175 Mon Sep 17 00:00:00 2001
From: 2510220824 <2510220824@qq.com>
Date: Fri, 21 Jan 2022 08:12:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?update:=E6=97=A0=E5=B2=97=E4=BD=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/login/rest/LoginRestController.java    |  5 +++
 .../SarStandProjectLibraryServiceImpl.java    | 36 +++++++++----------
 .../java/com/adc/da/sys/dao/UserEODao.java    |  2 ++
 .../adc/da/sys/service/IUserEOService.java    |  2 ++
 .../sys/service/impl/UserEOServiceImpl.java   |  5 +++
 .../mybatis/mapper/sys/UserEOMapper.xml       |  8 +++++
 6 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
index 5206abd3..7ec36fb3 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.List;
 
 
 @Validated
@@ -96,6 +97,10 @@ public class LoginRestController {
         if(userEO.getDisableFlag()==1){
             return Result.error("r0011", "帐号已禁用");
         }
+        String position = userService.selectPositionByUserId(account);
+        if(StringUtils.isBlank(position)){
+            return Result.error("r0011", "无配置岗位");
+        }
         String token = jwtUtils.generateToken(userEO.getUsid());
         userEO.setToken(token);
         // 加密重要信息
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 293ed9fd..e36f5f7d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -78,32 +78,30 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             //把刚刚拿到的值存到实体类里
             SarStandProjectLibrary projectInfo = new SarStandProjectLibrary();
             projectInfo
-                    .setProjectPlatfor(projectObject.get("eng_platform").getAsString())
-                    .setProjectNumber(projectObject.get("code").getAsString())
-                    .setProjectName(projectObject.get("name").getAsString())
-                    .setProjectClassification(projectObject.get("catalog_name").getAsString())
-                    .setProjectStatus(projectObject.get("project_status_name").getAsString())
-                    .setProjectGroup(projectObject.get("project_group_name").getAsString())
-                    .setCurrentNode(projectObject.get("project_current_milestone").getAsString())
-                    .setProjectLevel(projectObject.get("project_level").getAsString())
-                    .setProductLine(projectObject.get("eng_product_line").getAsString())
-                    .setManagementHostName(projectObject.get("management_host_name").getAsString())
-                    .setDevelopmentHostName(projectObject.get("development_host_name").getAsString())
-                    .setCategoryName(projectObject.get("category_name").getAsString());
+                    .setProjectPlatfor(projectObject.get("eng_platform")==null?"":projectObject.get("eng_platform").getAsString())
+                    .setProjectNumber(projectObject.get("code")==null?"":projectObject.get("code").getAsString())
+                    .setProjectName(projectObject.get("name")==null?"":projectObject.get("name").getAsString())
+                    .setProjectClassification(projectObject.get("catalog_name")==null?"":projectObject.get("catalog_name").getAsString())
+                    .setProjectStatus(projectObject.get("project_status_name")==null?"":projectObject.get("project_status_name").getAsString())
+                    .setProjectGroup(projectObject.get("project_group_name")==null?"":projectObject.get("project_group_name").getAsString())
+                    .setCurrentNode(projectObject.get("project_current_milestone")==null?"":projectObject.get("project_current_milestone").getAsString())
+                    .setProjectLevel(projectObject.get("project_level")==null?"":projectObject.get("project_level").getAsString())
+                    .setProductLine(projectObject.get("eng_product_line")==null?"":projectObject.get("eng_product_line").getAsString())
+                    .setManagementHostName(projectObject.get("management_host_name")==null?"":projectObject.get("management_host_name").getAsString())
+                    .setDevelopmentHostName(projectObject.get("development_host_name")==null?"":projectObject.get("development_host_name").getAsString())
+                    .setCategoryName(projectObject.get("category_name")==null?"":projectObject.get("category_name").getAsString());
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
-
-
-            try {
+            if(projectObject.get("target_begin_on") != null){
                 Date targetBeginOn = simpleDateFormat.parse(projectObject.get("target_begin_on").getAsString());
+                projectInfo
+                        .setProjectStartDate(targetBeginOn);
+            }
 
+            if(projectObject.get("target_end_on") != null){
                 Date targetEndOn = simpleDateFormat.parse(projectObject.get("target_end_on").getAsString());
                 projectInfo
-                        .setProjectStartDate(targetBeginOn)
                         .setProjectEndDate(targetEndOn);
-
-            } catch (ParseException e) {
-                e.printStackTrace();
             }
 
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
index 8e80deae..ba7ea109 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
@@ -129,6 +129,8 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
 	String selectOrgByUserId(String userId);
 
+	String selectPositionByUserId(String userId);
+
 	List<UserEO> queryUserEoList(UserEOPage page);
 	/***
 	 * 添加SSO来源用户
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
index 73a74e01..ab434c66 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
@@ -55,6 +55,8 @@ public interface IUserEOService extends IService<UserEO> {
 
     public List<String> selectThatOrgUser(String userId);
 
+    String selectPositionByUserId(String userId);
+
     public List<UserEO> queryUserEoList(UserEOPage page);
 
     public List<UserEO> queryUserInfoByWordNum(String workNum);
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
index d3265e76..8cef63a3 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
@@ -394,6 +394,11 @@ public class UserEOServiceImpl extends ServiceImpl<UserEODao, UserEO> implements
 		return  userIdList;
 	}
 
+	@Override
+	public String selectPositionByUserId(String userId) {
+		return baseMapper.selectPositionByUserId(userId);
+	}
+
 
 	public List<UserEO> queryUserEoList(UserEOPage page) {
 		page.setValidFlag("0");
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index 0e6f0f02..7bf0fda9 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -639,6 +639,14 @@
 		FROM TS_USER_ORG tuo
 		WHERE tuo.USER_ID = #{userId}
 	</select>
+
+    <select id="selectPositionByUserId" resultType="java.lang.String"
+            parameterType="java.lang.String">
+        SELECT position_id
+        FROM ts_user_position tuo
+        WHERE tuo.USER_ID = #{userId}
+        limit 1
+    </select>
     <!--syt:查询所有用户信息-->
     <select id="queryUserEoList" resultMap="BaseResultMap" parameterType="com.adc.da.sys.page.UserEOPage">
         SELECT

From cd8fffa2f8b172508b4ad7a4eedf116fdd523bbe Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 21 Jan 2022 13:36:28 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E6=8E=A5=E5=8F=A3=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/sys/controller/DicTypeEORestController.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
index e58f8e60..3f1560e4 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
@@ -340,10 +340,8 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
     @GetMapping("/getDicTypeListCode")
     //@RequiresPermissions("sys:dicType:getDicTypeListCode")
     public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
-
-        return Result.success("1","hello");
-//        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
-//        return Result.success(dicTypeEO);
+        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
+        return Result.success(dicTypeEO);
     }
 
     /**