Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移

src/main/java/com/zcloud/controller/system/LoginController.java

@@ -70,7 +70,19 @@ public class LoginController extends BaseController {
 
     @Autowired
     private PhotoService photoService;
+    @Value("${czks-useridentity}")
+    private String czksIdentity;
+    @Value("${czks-baseimgpath}")
+    private String czksBaseimgpath;
+    @Value("${czks-backendaddr}")
+    private String czksBackendaddr;
 
+    @Value("${gwj-useridentity}")
+    private String gwjIdentity;
+    @Value("${gwj-baseimgpath}")
+    private String gwjBaseimgpath;
+    @Value("${gwj-backendaddr}")
+    private String gwjBackendaddr;
     /**
      * 请求登录验证用户接口
      *
@@ -171,6 +183,25 @@ public class LoginController extends BaseController {
                         map.put("failMsg", "帐号已锁定，请联系管理员");
                         return map;
                     }
+                    // 判断是不是沧州矿石的用户
+                    if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) {
+                        // 沧州矿石的用户
+                        // 用户标识
+                        map.put("USER_IDENTITY", czksIdentity);
+                        // 图片路径
+                        map.put("baseImgPath", czksBaseimgpath);
+                        // 后台地址
+                        map.put("BACKENDADDR", czksBackendaddr);
+                    }
+                    if ("".equals(pd.getString("USER_IDENTITY"))) {
+                        // 港股的用户
+                        // 用户标识
+                        map.put("USER_IDENTITY", gwjIdentity);
+                        // 图片路径
+                        map.put("baseImgPath", gwjBaseimgpath);
+                        // 后台地址
+                        map.put("BACKENDADDR", gwjBackendaddr);
+                    }
                     PageData cpd = corpinfoService.findById(pd);
                     //System.out.println(cpd.getString("ISUSE"));
                     if (cpd != null) {

src/main/resources/application-dev.properties

@@ -93,3 +93,14 @@ mq.group.eightWork=scheduled_tasks_eightWork
 
 corp.default.pic-path=https://qgqy.qhdsafety.com/file/
 corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/
+
+
+#用户标识
+# 沧州矿石
+czks-useridentity=CZKS
+czks-baseimgpath=https://wwag.qhdsafety.com/file/
+czks-backendaddr=http://192.168.0.79:8091/
+# 港务局
+gwj-useridentity=GWJ
+gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
+gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/

src/main/resources/mybatis/datasource/system/UsersMapper.xml

@@ -249,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<!-- 通过USERNAME获取数据 -->
 	<select id="findByUsername" parameterType="pd" resultType="pd" >
 		select
-			<include refid="Fieldf"></include> ,dept.name as deptName
+			<include refid="Fieldf"></include> ,f.USER_IDENTITY,dept.name as deptName
 		from
 			<include refid="tableName"></include> f
 		LEFT JOIN OA_DEPARTMENT dept on f.DEPARTMENT_ID = dept.DEPARTMENT_ID