Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!382

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);
         // 加密重要信息

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())
+                    .setProjectPlatfor(projectObject.get("eng_platform")==null?"":projectObject.get("eng_platform").getAsString())
-                    .setProjectNumber(projectObject.get("code").getAsString())
+                    .setProjectNumber(projectObject.get("code")==null?"":projectObject.get("code").getAsString())
-                    .setProjectName(projectObject.get("name").getAsString())
+                    .setProjectName(projectObject.get("name")==null?"":projectObject.get("name").getAsString())
-                    .setProjectClassification(projectObject.get("catalog_name").getAsString())
+                    .setProjectClassification(projectObject.get("catalog_name")==null?"":projectObject.get("catalog_name").getAsString())
-                    .setProjectStatus(projectObject.get("project_status_name").getAsString())
+                    .setProjectStatus(projectObject.get("project_status_name")==null?"":projectObject.get("project_status_name").getAsString())
-                    .setProjectGroup(projectObject.get("project_group_name").getAsString())
+                    .setProjectGroup(projectObject.get("project_group_name")==null?"":projectObject.get("project_group_name").getAsString())
-                    .setCurrentNode(projectObject.get("project_current_milestone").getAsString())
+                    .setCurrentNode(projectObject.get("project_current_milestone")==null?"":projectObject.get("project_current_milestone").getAsString())
-                    .setProjectLevel(projectObject.get("project_level").getAsString())
+                    .setProjectLevel(projectObject.get("project_level")==null?"":projectObject.get("project_level").getAsString())
-                    .setProductLine(projectObject.get("eng_product_line").getAsString())
+                    .setProductLine(projectObject.get("eng_product_line")==null?"":projectObject.get("eng_product_line").getAsString())
-                    .setManagementHostName(projectObject.get("management_host_name").getAsString())
+                    .setManagementHostName(projectObject.get("management_host_name")==null?"":projectObject.get("management_host_name").getAsString())
-                    .setDevelopmentHostName(projectObject.get("development_host_name").getAsString())
+                    .setDevelopmentHostName(projectObject.get("development_host_name")==null?"":projectObject.get("development_host_name").getAsString())
-                    .setCategoryName(projectObject.get("category_name").getAsString());
+                    .setCategoryName(projectObject.get("category_name")==null?"":projectObject.get("category_name").getAsString());
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
-
+            if(projectObject.get("target_begin_on") != null){
-
-            try {
                 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();
             }
 
 

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来源用户

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);

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");

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