Merge remote-tracking branch 'kgy/master' into master

@@ -162,6 +162,7 @@ public class InformationBaseServiceImpl implements InformationBaseService {
         String[] split = ids.split(",");
         String[] split = ids.split(",");
         for (String s : split) {
         for (String s : split) {
             Synthesize_no_1 synthesize_no_1 = no_1Service.getById(s);
             Synthesize_no_1 synthesize_no_1 = no_1Service.getById(s);
+            String projectName = synthesize_no_1.getProjectName();
             synthesize_no_1.setId(null);
             synthesize_no_1.setId(null);
             synthesize_no_1.setTime(new Date());
             synthesize_no_1.setTime(new Date());
             synthesize_no_1.setNewTime(new Date());
             synthesize_no_1.setNewTime(new Date());
@@ -169,6 +170,7 @@ public class InformationBaseServiceImpl implements InformationBaseService {
             synthesize_no_1.setUserId(UserContext.get().getId());
             synthesize_no_1.setUserId(UserContext.get().getId());
             synthesize_no_1.setDeleteState("3");
             synthesize_no_1.setDeleteState("3");
             synthesize_no_1.setModelCase(null);
             synthesize_no_1.setModelCase(null);
+            synthesize_no_1.setProjectName(projectName+"[副本]");
             no_1Service.save(synthesize_no_1);
             no_1Service.save(synthesize_no_1);
             Synthesize_no_1Img synthesize_no_1Img = synthesize_no_1ImgMapper.selectById(s);
             Synthesize_no_1Img synthesize_no_1Img = synthesize_no_1ImgMapper.selectById(s);
             if (!StringUtils.isEmpty(synthesize_no_1Img)) {
             if (!StringUtils.isEmpty(synthesize_no_1Img)) {

@@ -56,6 +56,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         String sign = JwtUtil.sign(user);
         String sign = JwtUtil.sign(user);
         map.put("token",sign);
         map.put("token",sign);
         map.put("state",user.getStatus());
         map.put("state",user.getStatus());
+        map.put("userName",user.getName());
+        map.put("companyName",user.getCompanyName());
+        map.put("department",user.getDepartment());
         return map;
         return map;
     }
     }
 }
 }