新增不再提醒修改密码接口

biz-base/src/main/java/com/dayou/controller/UserController.java

@@ -345,5 +345,15 @@ public class UserController extends BaseController {
         return RestResponse.data(ConvertUtil.copyList(userService.byDepartmentName(depName), PullDownModel.class));
     }
 
+    /**
+     * 不再提示修改登录密码
+     * @return
+     */
+    @GetMapping("/notRemind")
+    public RestResponse<Boolean> notRemind(){
+        Boolean ret = userService.notRemind();
+        return RestResponse.data(ret);
+    }
+
 }
 

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -661,7 +661,7 @@
             major_production mp
                 left join major m on m.id = mp.major_id
                 INNER JOIN ( SELECT id,business_id,should_amount FROM order_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) orf ON orf.business_id = m.id
-                LEFT JOIN ( SELECT id,business_id,production_no,real_amount,standard_amount,production_should_amount FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0) off  ON (off.business_id = m.id and off.production_no = mp.report_no)
+                LEFT JOIN ( SELECT id,business_id,production_no,real_amount,standard_amount,production_should_amount,production_type FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0) off  ON (off.business_id = m.id and off.production_no = mp.report_no and off.production_type = mp.production)
                 LEFT JOIN user u ON u.id = m.principal_id
                 LEFT JOIN user u1 ON u1.id = m.client_manager_id
                 LEFT JOIN customer_company cc ON cc.id = m.clientele_id

service/src/main/java/com/dayou/service/IUserService.java

@@ -119,4 +119,6 @@ public interface IUserService extends IService<User> {
      * @return List<User>
      */
     List<User> byDepartmentName(String depName);
+
+    Boolean notRemind();
 }

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -630,6 +630,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return userMapper.byDepartmentName(depName);
     }
 
+    @Override
+    public Boolean notRemind() {
+        Long currentUserId = LoginContext.getCurrentUserId();
+        return this.update(new LambdaUpdateWrapper<User>().set(User::getPasswordState,false).eq(BaseEntity::getId,currentUserId));
+    }
+
     /**
      * 递归查询下级岗位
      * @param postIds