密码重置

订单增加公证员姓名字段
银行APP端限制仅能登录银行客户经理

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/UserController.java

@@ -28,19 +28,20 @@ import me.zhengjie.application.admin.service.dto.JwtUserDto;
 import me.zhengjie.application.admin.service.dto.RoleSmallDto;
 import me.zhengjie.application.admin.service.dto.UserDto;
 import me.zhengjie.application.admin.service.dto.UserQueryCriteria;
-import me.zhengjie.application.bank.service.FileInfoService;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.util.ApplicationContextUtil;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.config.RsaProperties;
-import me.zhengjie.dao.mybatis.entity.*;
+import me.zhengjie.dao.mybatis.entity.Dept;
+import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
+import me.zhengjie.dao.mybatis.entity.NotaryOfficeEntity;
+import me.zhengjie.dao.mybatis.entity.User;
 import me.zhengjie.dao.mybatis.mapper.BankMapper;
 import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
 import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.enums.CodeEnum;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -149,6 +150,17 @@ public class UserController {
         return new ResponseEntity<>(userList,HttpStatus.OK);
     }
 
+    @Log("重置密码")
+    @ApiOperation("重置密码")
+    @PostMapping("/reset-password")
+    @PreAuthorize("@el.check('user:reset')")
+    public AppBaseResponse resetPassword(@RequestBody User user) {
+        checkLevel(user);
+        // 默认密码 123456
+        userService.updatePass(user.getUsername(), passwordEncoder.encode("123456"));
+        return AppBaseResponse.success();
+    }
+
     @Log("新增用户")
     @ApiOperation("新增用户")
     @PostMapping
@@ -215,7 +227,7 @@ public class UserController {
 
     @ApiOperation("修改头像")
     @PostMapping(value = "/updateAvatar")
-    public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar){
+    public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar) {
         return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
     }
 
@@ -277,7 +289,6 @@ public class UserController {
      * @param user
      * @return
      */
-
     @PostMapping(value = "/uploadSeal")
     public AppBaseResponse uploadSeal(@RequestBody User user){
         return userService.uploadSeal(user);

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/NotaryOrderQueryRsp.java

@@ -42,6 +42,8 @@ public class NotaryOrderQueryRsp {
 	private String bankName;
 	// 客户经理
 	private String customerName;
+	// 公证员姓名
+	private String notaryUserName;
 	//'所属银行id',
 	private String bankId;
 	// 自动生成公证书标记

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/NotaryNoteServiceImpl.java

@@ -110,7 +110,7 @@ public class NotaryNoteServiceImpl implements NotaryNoteService {
 
 	/**
 	 * 关联当前公证员ID
-	 * 
+	 *
 	 * @param businessNo
 	 */
 	private void saveNotaryUserId(String businessNo) {
@@ -119,6 +119,7 @@ public class NotaryNoteServiceImpl implements NotaryNoteService {
 		ContractOrderEntity saveOrder = new ContractOrderEntity();
 		saveOrder.setId(curOrder.getId());
 		saveOrder.setNotaryUserId(currentUserId);
+		saveOrder.setNotaryUserName(contextUtil.getCurrentUser().getNickName());
 		contractOrderRepository.updateWithId(saveOrder);
 	}
 

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankLoginServiceImpl.java

@@ -31,7 +31,7 @@ public class BankLoginServiceImpl implements BankLoginService {
 		sysUser.setPhone(loginVo.getPhone());
 		sysUser.setPassword(loginVo.getPassword());
 		sysUser = userService.login(sysUser);
-		if (sysUser != null) {
+		if (sysUser != null && sysUser.getOrgId().startsWith("bank")) {
 			String token = tokenProvider.appToken(loginVo.getPhone());
 			tokenProvider.setTokenTime(token, JSONObject.toJSONString(sysUser));
 			return ResponseDTO.success(token);

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/ContractOrderEntity.java

@@ -149,6 +149,9 @@ public class ContractOrderEntity implements Serializable {
     @TableField("notary_user_id")
     private String notaryUserId;
 
+    @TableField("notary_user_name")
+    private String notaryUserName;
+
     @TableField("auto_generate")
     private String autoGenerate;