1

MadRunFabric.EquipmentApi/EquipmentApi.Repositories/Wo_Repair_BaseRepository.cs

@@ -937,7 +937,7 @@ namespace EquipmentApi.Repositories
                         }
                     }
 
-                    if (userinfo.type == 2)//查看自己创建的工单
+                    if (userinfo.type == 2|| userinfo.role_code== "BGR")//查看自己创建的工单
                 {
                     query = query.Where(it => it.createuser == userinfo.usercode);
                 }
@@ -1628,8 +1628,8 @@ namespace EquipmentApi.Repositories
                 join sysprovinces in _collection_sys_provinces.AsQueryable() on repairbase.province equals sysprovinces.provincecode into sys_provincesDefa
                 join syscity in _collection_sys_city.AsQueryable() on repairbase.city equals syscity.citycode into sys_cityDefa
                 join wxtimelis in _collection_ewxwpstime.AsQueryable() on repairbase.wxtimeid equals wxtimelis.id into wxtimelisDefa
-                //where repairbase.isdelete == 0&&repairbase.Jwocode==rolename
-                where repairbase.isdelete == 0 && repairbase.touser.Contains(userinfo.usercode)
+                where repairbase.isdelete == 0&&(repairbase.Jwocode==rolename || repairbase.touser.Contains(userinfo.usercode))
+               // where repairbase.isdelete == 0 && repairbase.touser.Contains(userinfo.usercode)
                 orderby repairbase.totime descending
                 select new
                 {
@@ -1719,7 +1719,7 @@ namespace EquipmentApi.Repositories
                 query = query.Where(it => it.createtime <= Convert.ToDateTime(etime + " 23:59:59"));
 
 
-            if (userinfo.type == 2)//查看自己创建的工单
+            if (userinfo.type == 2 || userinfo.role_code == "BGR")//查看自己创建的工单
             {
                 query = query.Where(it => it.createuser == userinfo.usercode);
             }
@@ -1736,7 +1736,8 @@ namespace EquipmentApi.Repositories
 
                    if (userinfo.role_code == "YWYG")
                     {
-                        query = query.Where(it => (it.touser.Count() == 0 || it.touser.Contains(nowusercode) || it.dealuser.Contains(nowusercode))
+                        query = query.Where(it => (it.touser.Count() == 0 || it.touser.Contains(nowusercode) || it.dealuser.Contains(nowusercode)  
+                          || (it.Jwocode == userinfo.role_name && it.wostate == 0))
                         );
                     }
                     else
@@ -2201,7 +2202,8 @@ namespace EquipmentApi.Repositories
                     repairbase.canceltime,
                     repairbase.score,
                     repairbase.wxtimeid,
-                    wxcenter = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().wxcenter : ""
+                    wxcenter = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().wxcenter : "",
+                    repairbase.Jwocode
                 };
             #endregion
             var model = query.FirstOrDefault();

MadRunFabric.EquipmentApi/EquipmentApi/Controllers/workordermanage/WoRepairBaseController.cs

@@ -8935,7 +8935,7 @@ namespace EquipmentApi.Controllers.workordermanage
                 model.wxcenter = item.wxcenter;//维修项目
                 model.timecount = item.timecount;//时长
                 model.bzid = item.bzid;//班组编号
-
+              
                 if (roleinfo != null)
                 {
                     model.bzname = roleinfo.role_name;//班组名称

MadRunFabric.SignTokenApi/SignTokenApi/Controllers/UserAccountController.cs

@@ -27,9 +27,11 @@ namespace SignTokenApi.Controllers
         private readonly IConfiguration _configuration;
         private readonly ILogger<UserAccountController> _logger;
         private readonly ISys_User_AccountRepository _sys_user_accountRepository;
-        public UserAccountController(IConfiguration configuration, ILogger<UserAccountController> logger, ISys_User_AccountRepository sys_user_accountRepository)
+        private readonly ISys_Role_InfoRepository _sys_role_infoRepository;
+        public UserAccountController(ISys_Role_InfoRepository sys_role_infoRepository, IConfiguration configuration, ILogger<UserAccountController> logger, ISys_User_AccountRepository sys_user_accountRepository)
         {
             _configuration = configuration;
+            _sys_role_infoRepository = sys_role_infoRepository;
             _logger = logger;
             _sys_user_accountRepository = sys_user_accountRepository;
         }
@@ -609,6 +611,7 @@ namespace SignTokenApi.Controllers
             string dbkeys = _configuration["upload:dbkeys"].ToString().ToLower();
             string[] dbcols = dbkeys.Split(",");
             string errmsg = string.Empty;
+            var list = await _sys_role_infoRepository.Get(x => x.state_flag == 1);
 
             if (num > 0)
             {
@@ -622,7 +625,8 @@ namespace SignTokenApi.Controllers
                     model.lock_flag = false;//导入禁用，需要重新编辑
                     model.dept_id = "import";
                     model.password = "e10adc3949ba59abbe56e057f20f883e";
-                    model.role_id = "5fb22143751cef5115b5da20";
+                    if (list.Where(x => x.role_name == dr["role_id"].ToString()).Count() >0)
+                    model.role_id = list.Where(x=>x.role_name== dr["role_id"].ToString()).FirstOrDefault().id ;
                     List<string> plist = new List<string>();
                     string arry = dr["postlist"].ToString();
                     if (!string.IsNullOrEmpty(arry)) {