diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
index 14899b7b..5f85287c 100644
--- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
+++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
@@ -58,9 +58,9 @@ public class TokenController {
     //web端登录
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form) throws Exception {
-        //String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey);
+        String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey);
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData);
         String uuid = form.getUuid();
         String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString();
         if (StringUtils.isBlank(captcha)) {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 97695723..8315dc3a 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -619,13 +619,12 @@ public class TmTaskServiceImpl implements TmTaskService {
 
         for (TmTask tmTask : tmTaskList) {
             int count = 0;
-            tmTask.setDeptId(deptId);
             if (tmTask != null) {
                 // 去查询任务分单表
                 List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
                 if (collect.size() > 0) {
                     int deptId1 = tmTaskMapper.getDeptId(collect.get(0).getCreateBy());
-                    if (roles.contains("admin")) {
+                    if (roles.contains("admin") || deptId == 100) {
                         // 对领料任务集合查询具体详情
                         for (LeaseApplyInfo leaseApplyInfo : collect) {
                             if (leaseApplyInfo != null) {
@@ -642,6 +641,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                                     leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
                                     // 存入领料任务实体集合
                                     tmTask.setLeaseApplyInfoList(collect);
+                                    tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1)));
                                     tmTask.setRemark(collect.get(0).getRemark());
                                 }
                             }
@@ -670,6 +670,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                                         leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
                                         // 存入领料任务实体集合
                                         tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
+                                        tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1)));
                                         tmTask.setRemark(collect.get(0).getRemark());
                                     }
                                 }
@@ -699,6 +700,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                                         leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
                                         // 存入领料任务实体集合
                                         tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
+                                        tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1)));
                                         tmTask.setRemark(collect.get(0).getRemark());
                                     }
                                 }
@@ -721,6 +723,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                                     leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
                                     // 存入领料任务实体集合
                                     tmTask.setLeaseApplyInfoList(collect);
+                                    tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1)));
                                     tmTask.setRemark(collect.get(0).getRemark());
                                 }
                             }
@@ -749,6 +752,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                                         leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
                                         // 存入领料任务实体集合
                                         tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
+                                        tmTask.setDeptId(Long.parseLong(String.valueOf(deptId1)));
                                         tmTask.setRemark(collect.get(0).getRemark());
                                     }
                                 }