bf

yiming
1 parent dcbaba3a
Showing 9 changed files with 110 additions and 7 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/Company.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
@@ -112,6 +112,7 @@ public class BsthTLineAddController extends BaseController
         BsthTLine bl=new BsthTLine();
         bl.setLineName(bsthTLine.getLineName());
         bl=bsthTLineService.selectBsthTLineExamineByLineName(bl);
+        bsthTLineService.getDeptId(bsthTLine);
         if(bl==null){
             bsthTLine.setLineUpdateType("0");
             bsthTLine.setExamineType("0");
@@ -149,6 +150,7 @@ public class BsthTLineAddController extends BaseController
     {
         User loginUser = ShiroUtils.getSysUser();
         bsthTLine.setUpdateBy(loginUser.getUserName());
+        bsthTLineService.getDeptId(bsthTLine);
         return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
     }
@@ -110,6 +110,7 @@ public class BsthTLineHistoryController extends BaseController
         BsthTLine bl=new BsthTLine();
         bl.setLineName(bsthTLine.getLineName());
         BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(bl);
+        bsthTLineService.getDeptId(bsthTLine);
         if(bsthTLineExamine!=null){//存在申请直接覆盖
             bsthTLine.setId(bsthTLineExamine.getId());
             ajaxResult= toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
@@ -286,6 +286,8 @@ public class BsthTLine extends BaseEntity
     private Long historyId;
+    private Long deptId;
+
     public Long getId() {
         return id;
     }
@@ -857,4 +859,12 @@ public class BsthTLine extends BaseEntity
     public void setHistoryId(Long historyId) {
         this.historyId = historyId;
     }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
 }
+package com.ruoyi.project.system.line.domain;
+
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+
+
+public class Company extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String company;
+
+    private String fCompany;
+
+    private String companyID;
+
+    private String dept_id;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public void setfCompany(String fCompany) {
+        this.fCompany = fCompany;
+    }
+
+    public void setCompanyID(String companyID) {
+        this.companyID = companyID;
+    }
+
+    public void setDept_id(String dept_id) {
+        this.dept_id = dept_id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public String getfCompany() {
+        return fCompany;
+    }
+
+    public String getCompanyID() {
+        return companyID;
+    }
+
+    public String getDept_id() {
+        return dept_id;
+    }
+}
@@ -79,4 +79,6 @@ public interface BsthTLineMapper
 	BsthTLine selectBsthTLineHistory(BsthTLine bsthTLine);
 	List<LineHistoryReport>getLineHistoryReport(BsthTLine bsthTLine);
+
+	long getDeptId(Company company);
 }
@@ -75,4 +75,6 @@ public interface IBsthTLineService
 	List<BsthTLineKFK> changeCN(List<BsthTLineKFK> list);
 	void getCarPlate();
+
+	void getDeptId(BsthTLine bsthTLine);
 }
@@ -185,6 +185,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 					//存入主表和历史表
 					bl=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());
 					bl.setUpdateStatus("0");
+					this.getDeptId(bl);
 					bsthTLineMapper.saveEditHistory(bl);
 					i=bsthTLineMapper.insertBsthTLine(bl);
 					//删除审核表
@@ -226,6 +227,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 					//把审核表的记录插入历史表 状态 0-当前 记录前一次数据的id
 					bl.setUpdateStatus("0");
 					bl.setHistoryId(blo.getId());
+					this.getDeptId(bl);
 					bsthTLineMapper.saveEditHistory(bl);
 					//修改主表
 					bl.setId(bsthTLine1.getId());
@@ -302,6 +304,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	@Override
+	@DataScope(deptAlias = "b")
 	public List<BsthTLine> selectBsthTLineListAndExamine(BsthTLine bsthTLine)
 	{
 		return bsthTLineMapper.selectBsthTLineListAndExamine(bsthTLine);
@@ -478,4 +481,10 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 		}
 	}
+	public void getDeptId(BsthTLine bsthTLine){
+		Company company=new Company();
+		company.setfCompany(bsthTLine.getfCompany());
+		long deptId= bsthTLineMapper.getDeptId(company);
+		bsthTLine.setDeptId(deptId);
+	}
 }
@@ -100,7 +100,9 @@ public class LoginController extends BaseController
             User user = tokenService.getUser(token);
             if (user == null && token != null) {
-                String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);
+                //String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);
+                String dataJsonStr = sendPost("http://112.64.45.51:32740/information/authenticate/loginAuthentication",token);
+
                 //String dataJsonStr="{\"code\":200,\"msg\":\"成功\",\"data\":{\"userId\":\"50aa4eea655d42c49bef086e68a789ad\",\"userName\":\"拓华\",\"userType\":null,\"photoPath\":\"http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/\",\"sex\":\"女\",\"idCard\":\"\",\"telephoneNumber\":\"1\",\"mailbox\":\"1\",\"account\":\"100005\",\"status\":\"01\",\"remark\":\"\",\"sort\":\"\",\"orgId\":\"7E1EAC2C-AE4D-42B3-A8ED-B0AF6929B889\",\"companyInfo\":{\"organizationId\":\"578ECB10-9859-47CC-A6D5-CEE09536243D\",\"parentId\":\"7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A\",\"number\":\"KD01.0115\",\"simpleNameCn\":\"PJ\",\"simpleName\":\"浦交本部\",\"name\":\"上海浦东新区公交本部\",\"fullName\":\"上海浦东新区公共交通有限公司/上海浦东新区公交本部\",\"status\":\"01\",\"remark\":null,\"type\":\"01\",\"attributes\":\"01\",\"sort\":\"KD01.0101\"},\"orgInfo\":{\"organizationId\":\"7E1EAC2C-AE4D-42B3-A8ED-B0AF6929B889\",\"parentId\":\"EB26BC7B-D6BA-49BE-83A2-661E6D1E1825\",\"number\":\"KD01.0115.0013.0010\",\"simpleNameCn\":\"XXGLB\",\"simpleName\":\"信息管理部\",\"name\":\"信息管理部\",\"fullName\":\"上海浦东新区公共交通有限公司/上海浦东新区公交本部/浦交本部/信息管理部\",\"status\":\"01\",\"remark\":null,\"type\":\"02\",\"attributes\":\"\",\"sort\":\"KD01.0101.0001.0012\"},\"userAuthList\":[{\"pjtId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"pjtName\":\"线路档案系统\",\"pjtCode\":\"SYS0015\",\"sort\":\"15\",\"roleList\":[{\"roleId\":\"5e7bcde5554b470ab3a1324703cfed6e\",\"roleName\":\"拓华测试角色\",\"roleCode\":\"thcsjs\",\"sort\":\"1\",\"resourceList\":[{\"resourceId\":\"d3f86b2cb7004cfdb0fcde3cd7c63db8\",\"parentId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"resourceName\":\"定时任务\",\"resourceCode\":\"定时任务\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"110\",\"menuParentId\":\"2\",\"groupBy\":null},{\"resourceId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"地图维度查询\",\"resourceCode\":\"地图维度查询\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2032\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路变更管理\",\"resourceCode\":\"线路变更管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2031\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"1206d2b8eab64861a7eb01ed048ca520\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"菜单管理\",\"resourceCode\":\"菜单管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"eb239b91709a48d4b9e2d27d72258154\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"线路变更月报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2010\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"625b5ad8ed284b8fa2946109332ee240\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2007\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2cd312c1fd8f42c59dbfea33e2d6b0ba\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路基础信息报表\",\"resourceCode\":\"线路基础信息报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2035\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"fe9efa556357482cacbcc95010275589\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"岗位管理\",\"resourceCode\":\"岗位管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"104\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"49611a31bea943b6bdb855a2d4d2dcf1\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"部门管理\",\"resourceCode\":\"部门管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"c168cb7d7f0b44ed8279371086993137\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"用户管理\",\"resourceCode\":\"/system/user\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"0\",\"menuId\":\"100\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"5f5f6fb757894661bd005a74327cc6df\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"字典管理\",\"resourceCode\":\"字典管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"105\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"报表管理\",\"resourceCode\":\"报表管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2034\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统管理\",\"resourceCode\":\"system\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"1\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"7145d027c875466291722a9c5abeb368\",\"parentId\":\"a937d70ad81d415294ae226a8acc711a\",\"resourceName\":\"线路历史沿革\",\"resourceCode\":\"线路历史沿革\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2012\",\"menuParentId\":\"2033\",\"groupBy\":null},{\"resourceId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统监控\",\"resourceCode\":\"系统监控\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"2\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"2e9a714cdf984da38e0c6a74e452e3b0\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"historyReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"4\",\"menuId\":\"2010\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"1c382ca2da92468ab53c205daed27286\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息月报表\",\"resourceCode\":\"lineReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"3\",\"menuId\":\"2009\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"a937d70ad81d415294ae226a8acc711a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"历史信息管理\",\"resourceCode\":\"历史信息管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2033\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"f25d5506f9224c6c9fac72219dff8f8a\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"角色管理\",\"resourceCode\":\"角色管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"101\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"54087ffab360444680066475d2c745da\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路档案\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2006\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"fa687ea4d5494e0c80f08269bf8ebcea\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"沿革\",\"resourceCode\":\"historyCompare\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"6\",\"menuId\":\"2012\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"50bc627ecc1841f786ae011fda227561\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"地图查询\",\"resourceCode\":\"map\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"5\",\"menuId\":\"2011\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2a0bea23ab554586a563e1ff8b8ef8cf\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路审核\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2030\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"6308d837f5574216816c40a94c327d9d\",\"parentId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"resourceName\":\"线路变更信息\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"lineHistory\",\"sort\":\"\",\"menuId\":\"2008\",\"menuParentId\":\"2031\",\"groupBy\":null},{\"resourceId\":\"09e645f5086a465bbd6992adecfbba7e\",\"parentId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"resourceName\":\"地图\",\"resourceCode\":\"地图\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2011\",\"menuParentId\":\"2032\",\"groupBy\":null}]}],\"globalResourceList\":[{\"resourceId\":\"09e645f5086a465bbd6992adecfbba7e\",\"parentId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"resourceName\":\"地图\",\"resourceCode\":\"地图\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2011\",\"menuParentId\":\"2032\",\"groupBy\":null},{\"resourceId\":\"1206d2b8eab64861a7eb01ed048ca520\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"菜单管理\",\"resourceCode\":\"菜单管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"1c382ca2da92468ab53c205daed27286\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息月报表\",\"resourceCode\":\"lineReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"3\",\"menuId\":\"2009\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2a0bea23ab554586a563e1ff8b8ef8cf\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路审核\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2030\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2cd312c1fd8f42c59dbfea33e2d6b0ba\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路基础信息报表\",\"resourceCode\":\"线路基础信息报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2035\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"2e9a714cdf984da38e0c6a74e452e3b0\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"historyReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"4\",\"menuId\":\"2010\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统监控\",\"resourceCode\":\"系统监控\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"2\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"报表管理\",\"resourceCode\":\"报表管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2034\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"49611a31bea943b6bdb855a2d4d2dcf1\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"部门管理\",\"resourceCode\":\"部门管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"50bc627ecc1841f786ae011fda227561\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"地图查询\",\"resourceCode\":\"map\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"5\",\"menuId\":\"2011\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"54087ffab360444680066475d2c745da\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路档案\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2006\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"5f5f6fb757894661bd005a74327cc6df\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"字典管理\",\"resourceCode\":\"字典管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"105\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"625b5ad8ed284b8fa2946109332ee240\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2007\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"6308d837f5574216816c40a94c327d9d\",\"parentId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"resourceName\":\"线路变更信息\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"lineHistory\",\"sort\":\"\",\"menuId\":\"2008\",\"menuParentId\":\"2031\",\"groupBy\":null},{\"resourceId\":\"7145d027c875466291722a9c5abeb368\",\"parentId\":\"a937d70ad81d415294ae226a8acc711a\",\"resourceName\":\"线路历史沿革\",\"resourceCode\":\"线路历史沿革\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2012\",\"menuParentId\":\"2033\",\"groupBy\":null},{\"resourceId\":\"a937d70ad81d415294ae226a8acc711a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"历史信息管理\",\"resourceCode\":\"历史信息管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2033\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路变更管理\",\"resourceCode\":\"线路变更管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2031\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统管理\",\"resourceCode\":\"system\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"1\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"c168cb7d7f0b44ed8279371086993137\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"用户管理\",\"resourceCode\":\"/system/user\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"0\",\"menuId\":\"100\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"d3f86b2cb7004cfdb0fcde3cd7c63db8\",\"parentId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"resourceName\":\"定时任务\",\"resourceCode\":\"定时任务\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"110\",\"menuParentId\":\"2\",\"groupBy\":null},{\"resourceId\":\"eb239b91709a48d4b9e2d27d72258154\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"线路变更月报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2010\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"f25d5506f9224c6c9fac72219dff8f8a\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"角色管理\",\"resourceCode\":\"角色管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"101\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"地图维度查询\",\"resourceCode\":\"地图维度查询\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2032\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"fa687ea4d5494e0c80f08269bf8ebcea\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"沿革\",\"resourceCode\":\"historyCompare\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"6\",\"menuId\":\"2012\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"fe9efa556357482cacbcc95010275589\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"岗位管理\",\"resourceCode\":\"岗位管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"104\",\"menuParentId\":\"1\",\"groupBy\":null}]}]}}";
                 JSONObject jsonObject = JSON.parseObject(dataJsonStr);
@@ -253,6 +253,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="files != null">files,</if>
 			<if test="lineUpdateType != null">line_update_type,</if>
 			<if test="revenueType != null">revenue_type,</if>
+			<if test="deptId != null">dept_id,</if>
 			create_time,
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -318,6 +319,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="files != null">#{files},</if>
 			<if test="lineUpdateType != null">#{lineUpdateType},</if>
 			<if test="revenueType != null">#{revenueType},</if>
+			<if test="deptId != null">#{deptId},</if>
 			sysdate(),
 		</trim>
 	</insert>
@@ -390,6 +392,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="files != null">files = #{files},</if>
 			<if test="revenueType != null">revenue_type = #{revenueType},</if>
 			<if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
+			<if test="deptId != null">dept_id = #{deptId},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -460,6 +463,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="files != null">files = #{files},</if>
 			<if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
 			<if test="revenueType != null">revenue_type = #{revenueType},</if>
+			<if test="deptId != null">dept_id = #{deptId},</if>
 		</trim>
 		where line_name = #{lineName}
 	</update>
@@ -606,6 +610,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="examineType != null">examine_type,</if>
 			<if test="lineUpdateType != null">line_update_type,</if>
 			<if test="examineStatus != null">examine_status,</if>
+			<if test="deptId != null">dept_id,</if>
 			create_time,
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -673,6 +678,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="examineType != null">#{examineType},</if>
 			<if test="lineUpdateType != null">#{lineUpdateType},</if>
 			<if test="examineStatus != null">#{examineStatus},</if>
+			<if test="deptId != null">#{deptId},</if>
 			sysdate(),
 		</trim>
 	</insert>
@@ -764,6 +770,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="revenueType != null">revenue_type = #{revenueType},</if>
 			<if test="examineType != null">examine_type = #{examineType},</if>
 			<if test="examineStatus != null">examine_status = #{examineStatus},</if>
+			<if test="deptId != null">dept_id=#{deptId},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -937,6 +944,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="revenueType != null">revenue_type,</if>
 			<if test="updateStatus != null">update_status,</if>
 			<if test="historyId != null">history_id,</if>
+			<if test="deptId != null">dept_id,</if>
 			create_time,
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -1004,6 +1012,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="revenueType != null">#{revenueType},</if>
 			<if test="updateStatus != null">#{updateStatus},</if>
 			<if test="historyId != null">#{historyId},</if>
+			<if test="deptId != null">#{deptId},</if>
 			sysdate(),
 		</trim>
 	</insert>
@@ -1076,6 +1085,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
 			<if test="revenueType != null">revenue_type = #{revenueType},</if>
 			<if test="updateStatus != null ">update_status = #{updateStatus},</if>
+			<if test="deptId != null">dept_id=#{deptId},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -1307,14 +1317,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	<select id="selectBsthTLineListAndExamine" parameterType="BsthTLine" resultMap="BsthTLineResult">
-		select  bsth_t_line.*,bsth_t_line_examine.examine_status from bsth_t_line left join bsth_t_line_examine
-		on bsth_t_line.line_name=bsth_t_line_examine.line_name
+		select  b.*,e.examine_status from bsth_t_line b left join bsth_t_line_examine e
+		on b.line_name=e.line_name
 		<where>
-		<if test="lineName != null  and lineName != ''"> bsth_t_line.line_name= #{lineName}</if>
-		<if test="company != null  and company != ''"> and bsth_t_line.company = #{company}</if>
-		<if test="fCompany != null  and fCompany != ''"> and bsth_t_line.f_company = #{fCompany}</if>
+		<if test="lineName != null  and lineName != ''"> b.line_name= #{lineName}</if>
+		<if test="company != null  and company != ''"> and b.company = #{company}</if>
+		<if test="fCompany != null  and fCompany != ''"> and b.f_company = #{fCompany}</if>
+		${params.dataScope}
 		</where>
-		order by bsth_t_line.id desc
+		order by b.id desc
 	</select>
@@ -1380,4 +1391,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		</where>
 	</select>
+	<select id="getDeptId" parameterType="com.ruoyi.project.system.line.domain.Company" resultType="long">
+		select dept_id from bsth_company where fCompany=#{fCompany}
+	</select>
+
 </mapper>
 \ No newline at end of file