修改接口

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -46,7 +46,7 @@ public interface LauncherConstant {
     String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin";
 
     /**
-     * nacos dev 地址 172.31.222.127   192.168.0.109 127.0.0.1
+     * nacos dev 地址 172.31.222.127   192.168.0.109     127.0.0.1
      */
     String NACOS_DEV_ADDR = "127.0.0.1:8848";
 

blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -504,7 +504,7 @@ public class CommonUtil {
     }
 
     public static String replaceOssUrl(String url) {
-        String osName = System.getProperty("os.name");
+       /* String osName = System.getProperty("os.name");
         if (osName != null && osName.toLowerCase().contains("linux")) {
             // 如果当前操作系统是Linux系统
             Map<String, String> envMap = System.getenv();
@@ -514,7 +514,7 @@ public class CommonUtil {
             }
         }
         //后续删除
-        System.out.println("replaceOssUrl " + url);
+        System.out.println("replaceOssUrl " + url);*/
         return url;
     }
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/LargeFileEndpoint.java

@@ -519,6 +519,7 @@ public class LargeFileEndpoint {
                 }
             }
         } catch (IOException e) {
+
         } finally {
             try {
                 if (fileInputStream != null) {

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/CorporationInfo.java

@@ -42,7 +42,7 @@ public class CorporationInfo extends BaseEntity {
      * 制度pdf地址
      */
     @ApiModelProperty(value = "制度pdf地址")
-    private String link;
+    private String linkUrl;
     /**
      * 制度域名
      */

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserFilesInfoVO.java

@@ -22,6 +22,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * 档案职工信息表视图实体类
@@ -44,7 +45,7 @@ public class UserFilesInfoVO extends UserFilesInfo {
 	private String carName;
 
 	@ApiModelProperty(value = "性别")
-	private String sex;
+	private Integer sex;
 
 	@ApiModelProperty(value = "性别中文")
 	private String sexName;

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -59,6 +59,9 @@ public interface IUserClient {
     String USER_INFO_ALL = API_PREFIX + "/get-users-all";
     String USER_LIST_INFO_BY_IDS = API_PREFIX + "/getUserListByIds";
 
+    // 用户修改
+    String UPDATE_USER_INFO = API_PREFIX + "/updateUserInfo";
+
     /**
      * 获取所有有效用户
      */
@@ -124,6 +127,9 @@ public interface IUserClient {
     @PostMapping(SAVE_USER)
     R<Boolean> saveUser(@RequestBody User user);
 
+    @PostMapping(UPDATE_USER_INFO)
+    R<Boolean> updateUserInfo(@RequestBody User user);
+
     /**
      * 删除用户
      *
@@ -166,4 +172,6 @@ public interface IUserClient {
     @GetMapping(USER_LIST_INFO_BY_IDS)
     List<User> userInfoByIds(@RequestBody List<Long> userIds);
 
+
+
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/CorporationInfoController.java

@@ -28,7 +28,9 @@ import org.hibernate.validator.constraints.Length;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.FileUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.entity.Attach;
@@ -143,6 +145,7 @@ public class CorporationInfoController extends BladeController {
             @ApiImplicitParam(name = "file", value = "文件源", required = true),
             @ApiImplicitParam(name = "id", value = "制度主键Id(重新上传必须传)", required = false)
     })
+    @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
     public R putFileAttach(@RequestParam("file") MultipartFile file, String id) {
         //
         CorporationInfo corporationInfo = new CorporationInfo();
@@ -170,7 +173,7 @@ public class CorporationInfoController extends BladeController {
             corporationInfo.setName(file.getName());
             corporationInfo.setOriginalName(file.getOriginalFilename());
             corporationInfo.setDomainUrl(newBladeFile.getDomain());
-            corporationInfo.setLink(newBladeFile.getPdfUrl());
+            corporationInfo.setLinkUrl(newBladeFile.getPdfUrl());
             corporationInfo.setName(newBladeFile.getName());
 
             corporationInfo.setAttachSize(newBladeFile.getFileSize());
@@ -180,7 +183,7 @@ public class CorporationInfoController extends BladeController {
             corporationInfo.setName(file.getName());
             corporationInfo.setOriginalName(file.getOriginalFilename());
             corporationInfo.setDomainUrl(newBladeFile.getDomain());
-            corporationInfo.setLink(newBladeFile.getPdfUrl());
+            corporationInfo.setLinkUrl(newBladeFile.getPdfUrl());
             corporationInfo.setName(newBladeFile.getName());
             corporationInfo.setAttachSize(newBladeFile.getFileSize());
             corporationInfo.setExtension(fileExtension);

blade-service/blade-control/src/main/java/org/springblade/control/controller/DictInfoController.java

@@ -16,12 +16,14 @@
  */
 package org.springblade.control.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 
 import javax.validation.Valid;
 
+import org.springblade.control.entity.UserContractInfo;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
@@ -74,12 +76,23 @@ public class DictInfoController extends BladeController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "新增或修改", notes = "传入dictInfo")
     public R submit(@Valid @RequestBody DictInfo dictInfo) {
+
         if (ObjectUtil.isNotEmpty(dictInfo.getId())) {
             DictInfo dictInfo1 = dictInfoService.getBaseMapper().selectById(dictInfo.getId());
             if (dictInfo1 != null && dictInfo1.getType().equals(6)) {
                 throw new ServiceException("没有权限，请联系管理员");
             }
         }
+
+        Long userCount = dictInfoService.getBaseMapper().selectCount(
+                Wrappers.<DictInfo>query().lambda()
+                        .eq(DictInfo::getDictName, dictInfo.getDictName())
+                        .eq(DictInfo::getType, dictInfo.getType())
+                        .eq(DictInfo::getIsDeleted, 0));
+        if(userCount>=1){
+            return R.success("数据已存在,请勿重复添加");
+        }
+
         CacheUtil.clear(DICT_CACHE, Boolean.FALSE);
         return R.status(dictInfoService.saveOrUpdate(dictInfo));
 

blade-service/blade-control/src/main/java/org/springblade/control/controller/UserContractInfoController.java

@@ -16,6 +16,9 @@
  */
 package org.springblade.control.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,10 +27,16 @@ import lombok.AllArgsConstructor;
 
 import javax.validation.Valid;
 
+import org.springblade.control.entity.DepartmentMonthPlan;
+import org.springblade.control.entity.UserFilesInfo;
+import org.springblade.control.service.IUserFilesInfoService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.system.user.entity.User;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -50,6 +59,8 @@ public class UserContractInfoController extends BladeController {
 
     private final IUserContractInfoService userContractInfoService;
 
+    private final IUserFilesInfoService userFilesInfoService;
+
     /**
      * 详情
      */
@@ -79,6 +90,17 @@ public class UserContractInfoController extends BladeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "传入userContractInfo")
     public R save(@Valid @RequestBody UserContractInfo userContractInfo) {
+        if(userContractInfo.getType()==2){
+            Long userCount = userFilesInfoService.getBaseMapper().selectCount(
+                    Wrappers.<UserFilesInfo>query().lambda()
+                            .eq(UserFilesInfo::getUserId, userContractInfo.getUserId())
+                            .eq(UserFilesInfo::getIsDeleted, 0));
+            if(userCount<=0){
+                UserFilesInfo userFilesInfo = new UserFilesInfo();
+                userFilesInfo.setUserId(userContractInfo.getUserId());
+                userFilesInfoService.saveOrUpdate(userFilesInfo);
+            }
+        }
         return R.status(userContractInfoService.save(userContractInfo));
     }
 
@@ -89,6 +111,17 @@ public class UserContractInfoController extends BladeController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "修改", notes = "传入userContractInfo")
     public R update(@Valid @RequestBody UserContractInfo userContractInfo) {
+        if(userContractInfo.getType()==2){
+            Long userCount = userFilesInfoService.getBaseMapper().selectCount(
+                    Wrappers.<UserFilesInfo>query().lambda()
+                            .eq(UserFilesInfo::getUserId, userContractInfo.getUserId())
+                            .eq(UserFilesInfo::getIsDeleted, 0));
+            if(userCount<=0){
+                UserFilesInfo userFilesInfo = new UserFilesInfo();
+                userFilesInfo.setUserId(userContractInfo.getUserId());
+                userFilesInfoService.saveOrUpdate(userFilesInfo);
+            }
+        }
         return R.status(userContractInfoService.updateById(userContractInfo));
     }
 
@@ -98,7 +131,28 @@ public class UserContractInfoController extends BladeController {
     @PostMapping("/submit")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "新增或修改", notes = "传入userContractInfo")
-    public R submit(@Valid @RequestBody UserContractInfo userContractInfo) {
+    public R submit(@Valid @RequestBody UserContractInfo userContractInfo, BladeUser bladeUser) {
+
+        if(userContractInfo.getType()==2){
+            Long userCount = userFilesInfoService.getBaseMapper().selectCount(
+                    Wrappers.<UserFilesInfo>query().lambda()
+                            .eq(UserFilesInfo::getUserId, userContractInfo.getUserId())
+                            .eq(UserFilesInfo::getIsDeleted, 0));
+            if(userCount<=0){
+                UserFilesInfo userFilesInfo = new UserFilesInfo();
+                userFilesInfo.setUserId(userContractInfo.getUserId());
+                userFilesInfoService.saveOrUpdate(userFilesInfo);
+            }
+        }
+
+        UserContractInfo one = userContractInfoService.getOne( new LambdaQueryWrapper<UserContractInfo>()
+                .eq(UserContractInfo::getUserId, userContractInfo.getUserId())
+                .eq(UserContractInfo::getType, userContractInfo.getType())
+                .eq(UserContractInfo::getIsDeleted, 0));
+
+        if(one !=null && StringUtil.isNotBlank(one.getId()+"")) {
+            userContractInfo.setId(one.getId());
+        }
         return R.status(userContractInfoService.saveOrUpdate(userContractInfo));
     }
 

blade-service/blade-control/src/main/java/org/springblade/control/controller/UserFilesInfoController.java

@@ -16,7 +16,6 @@
  */
 package org.springblade.control.controller;
 
-import com.alibaba.spring.util.BeanUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,12 +23,19 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.apache.commons.lang.StringUtils;
 import org.springblade.control.wrapper.UserFilesWrapper;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DateTimeUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.entity.UserInfo;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,6 +44,9 @@ import org.springblade.control.vo.UserFilesInfoVO;
 import org.springblade.control.service.IUserFilesInfoService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.time.LocalDate;
+import java.util.Date;
+
 /**
  * 档案职工信息表 控制器
  *
@@ -51,6 +60,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class UserFilesInfoController extends BladeController {
 
 	private final IUserFilesInfoService userFilesInfoService;
+	private final IUserClient userClient;
 
 /*	*//**
 	 * 详情
@@ -117,6 +127,15 @@ public class UserFilesInfoController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入userFilesInfo")
 	public R submit(@Valid @RequestBody UserFilesInfoVO userFilesInfoVO) {
 		UserFilesInfo userFilesInfo = BeanUtil.copy(userFilesInfoVO,UserFilesInfo.class);
+		User user = BeanUtil.copy(userFilesInfoVO, User.class);
+		if(StringUtils.isNotEmpty(userFilesInfoVO.getBirthday())){
+			String birders = userFilesInfoVO.getBirthday();
+			LocalDate localDate = DateTimeUtil.parseDate(birders);
+			Date date = DateUtil.toDate(localDate);
+			user.setBirthday(date);
+		}
+		user.setId(userFilesInfoVO.getUserId());
+		userClient.updateUserInfo(user);
 		return R.status(userFilesInfoService.saveOrUpdate(userFilesInfo));
 	}
 
@@ -147,7 +166,8 @@ public class UserFilesInfoController extends BladeController {
 	@GetMapping("/get-user-file-page")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "分页档案职工信息表", notes = "传入userFilesInfo")
-	public R<IPage<UserFilesInfoVO>> page(UserFilesInfoVO userFilesInfo,Query query) {
+	public R<IPage<UserFilesInfoVO>> page(UserFilesInfoVO userFilesInfo, Query query, BladeUser bladeUser) {
+		userFilesInfo.setUserTypeName(bladeUser.getTenantId());
 		IPage<UserFilesInfoVO> pages = userFilesInfoService.selectUserFilesInfoPage(Condition.getPage(query),userFilesInfo);
 		return R.data(UserFilesWrapper.build().pageVO(pages));
 	}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/CorporationInfoMapper.xml

@@ -12,7 +12,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
-        <result column="link" property="link"/>
+        <result column="link_url" property="linkUrl"/>
         <result column="domain_url" property="domainUrl"/>
         <result column="name" property="name"/>
         <result column="original_name" property="originalName"/>
@@ -22,9 +22,7 @@
 
 
     <select id="selectCorporationInfoPage" resultMap="corporationInfoResultMap">
-        select *
-        from c_corporation_info
-        where is_deleted = 0
+        select * from c_corporation_info where is_deleted = 0
     </select>
 
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserContractInfoMapper.xml

@@ -41,6 +41,9 @@
         <if test="param2.type!=null and param2.type!=''">
             and type = #{userContractInfo.type}
         </if>
+        <if test="param2.userId!=null and param2.userId!=''">
+            and user_id = #{userContractInfo.userId}
+        </if>
     </select>
 
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserFilesInfoMapper.xml

@@ -67,7 +67,10 @@
         (SELECT dict_name from c_dict_info a where a.code='con_type' and parent_id!=0 and dict_value =a.con_type) as conTypeName,
         (SELECT dict_name from c_dict_info a where a.code='user_status' and parent_id!=0 and dict_value =a.user_status) as userStatusName,
         (SELECT dict_name from c_dict_info a where a.code='political_type' and parent_id!=0 and dict_value =a.political_type) as politicalName
-        from c_view_user_files_info a where a.is_deleted = 0
+        from c_view_user_files_info a where a.tenant_id = #{param2.userTypeName} and  is_deleted=0
+        <if test="param2.userId!=null and param2.userId!=''">
+            and user_id = #{param2.userId}
+        </if>
     </select>
 
     <select id="getUserFileDetail" resultMap="userFilesInfoResultVoMap">
@@ -78,6 +81,6 @@
             (SELECT dict_name from c_dict_info a where a.code='con_type' and parent_id!=0 and dict_value =a.con_type) as conTypeName,
             (SELECT dict_name from c_dict_info a where a.code='user_status' and parent_id!=0 and dict_value =a.user_status) as userStatusName,
             (SELECT dict_name from c_dict_info a where a.code='political_type' and parent_id!=0 and dict_value =a.political_type) as politicalName
-        from c_view_user_files_info a where a.is_deleted = 0 and id=#{id}
+        from c_view_user_files_info a where  id=#{id} and  is_deleted=0
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java

@@ -39,7 +39,7 @@ import springfox.documentation.annotations.ApiIgnore;
 @AllArgsConstructor
 public class LeaveController extends BladeController implements CacheNames {
 
-   // private final ILeaveService leaveService;
+    private final ILeaveService leaveService;
 
     /**
      * 详情

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -87,6 +87,11 @@ public class UserClient implements IUserClient {
         return R.data(service.submit(user));
     }
 
+    @Override
+    public R<Boolean> updateUserInfo(User user) {
+        return R.data(service.saveOrUpdate(user));
+    }
+
     @Override
     @PostMapping(REMOVE_USER)
     public R<Boolean> removeUser(String tenantIds) {
@@ -124,4 +129,5 @@ public class UserClient implements IUserClient {
         return service.getBaseMapper().selectBatchIds(userIds);
     }
 
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -267,7 +267,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
     @Override
     public boolean updateUserInfo(User user) {
-        user.setPassword(null);
+
+        // 当为内控是 可以修改密码
+        if(user.getUserType().equals("5") && StringUtil.isNotBlank(user.getPassword())){
+            user.setPassword(DigestUtil.encrypt(user.getPassword()));
+        }else{
+            user.setPassword(null);
+        }
         return updateById(user);
     }