用户姓名修改和放错受控文件

application-facade/src/main/java/com/factory/web/service/impl/FileServiceImpl.java

@@ -168,8 +168,11 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileEntry> implemen
         Optional<OnsiteCalendar> cal = plan.getOnsiteCalendarList().stream().filter(s -> s.getTypeFlag().equals(param.getTypeFlag())).findFirst();
         String[] dates = param.getYearMonth().split("\\-");
         String setter = String.format("Setter/Jumper:%s", "");
-        if (!iscontroll) {
-            setter = String.format("Setter/Jumper:%s", getUserName(!cal.isPresent() ? null : cal.get().getUserId()));
+        if (iscontroll) {
+        	dates[0]="";
+        	dates[1]="";
+        }else {
+        	setter = String.format("Setter/Jumper:%s", getUserName(!cal.isPresent() ? null : cal.get().getUserId()));
         }
         return new String[]{
                 String.format("Production line:%s", plan.getOnsiteTitle() != null ? plan.getOnsiteTitle().getProductionLine() : ""),

common-user/src/main/java/com/factory/user/entity/vo/req/UserInsertReq.java

@@ -17,6 +17,9 @@ public class UserInsertReq {
 
     @ApiModelProperty("用户名称")
     private String username;
+    
+    @ApiModelProperty("姓名")
+    private String name;
 
     @ApiModelProperty("用户密码")
     private String password;

common-user/src/main/java/com/factory/user/entity/vo/res/UserRes.java

@@ -17,6 +17,9 @@ public class UserRes {
 
     @ApiModelProperty("账户名称")
     private String username;
+    
+    @ApiModelProperty("姓名")
+    private String name;
 
     @ApiModelProperty("角色id")
     private Long roleId;

common-user/src/main/java/com/factory/user/service/impl/UserInfoServiceImpl.java

@@ -24,6 +24,8 @@ import com.factory.user.mapper.UserInfoMapper;
 import com.factory.user.mapper.UserRoleMapper;
 import com.factory.user.service.UserInfoService;
 import com.factory.user.util.Base64;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -50,7 +52,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         }
         UserInfo userInfo = getById(id);
         if (userInfo != null) {
-            name = userInfo.getName();
+            name = StringUtils.isBlank(userInfo.getName())?userInfo.getUsername():userInfo.getName();
         }
         return name;
     }
@@ -81,6 +83,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
             UserRes userRes = new UserRes();
             userRes.setId(x.getId());
             userRes.setUsername(x.getUsername());
+            userRes.setName(x.getName());
             List<UserRole> userRoles = userRoleMapper.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, x.getId()));
             if (CollUtil.isNotEmpty(userRoles)) {
                 Role role = roleMapper.selectById(userRoles.get(0).getRoleId());
@@ -121,6 +124,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         String psd = Base64.encode(userInsertReq.getPassword().getBytes());
         userInfo.setPassword(psd);
         userInfo.setEffectiveTime(LocalDateTime.now());
+        userInfo.setName(userInsertReq.getName());
         if (userInsertReq.getShiftId() != null) {
             userInfo.setShiftId(userInsertReq.getShiftId());
         }
@@ -158,6 +162,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         if (userInsertReq.getShiftId() != null) {
             userInfo.setShiftId(userInsertReq.getShiftId());
         }
+        userInfo.setName(userInsertReq.getName());
         userInfo.setId(userInsertReq.getId());
         int up = baseMapper.updateById(userInfo);
         if (up > 0) {