Przeglądaj źródła

档案面谈新增绑定uid
面谈列表修改处理

anderx 9 miesięcy temu
rodzic
commit
0e627d5414

+ 2 - 3
src/main/java/com/goafanti/Interview/service/impl/UserInterviewProjectServiceImpl.java

@@ -5,13 +5,13 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.UserInterviewProjectMapper;
 import com.goafanti.common.model.UserInterviewProject;
 import com.goafanti.common.model.UserInterviewProjectBo;
+import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -28,11 +28,10 @@ public class UserInterviewProjectServiceImpl extends BaseMybatisDao<UserIntervie
 
     @Override
     public Pagination<UserInterviewProjectBo> list(UserInterviewProject userInterviewProject, Integer pageNo, Integer pageSize) {
-        Map<String, Object> params = new HashMap<>();
+        Map<String, Object> params = BeanUtilsExt.pushMap(userInterviewProject);
         if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
             userInterviewProject.setAid(TokenManager.getAdminId());
         }
-        params.put("in", userInterviewProject);
         return (Pagination<UserInterviewProjectBo>) findPage("findUserInterviewProjectList",
                 "findUserInterviewProjectCount", params, pageNo, pageSize);
     }

+ 3 - 0
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -84,6 +84,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         }
         UserArchivesDetails user = customerService.selectUserByUid(id);
         User u = userMapper.queryById(id);
+
         OrganizationIdentity ori = organizationIdentityMapper.selectOrgIdentityByUserId(id);
         pushProvincePlus(ori, user);
 
@@ -93,6 +94,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
             user.setMyUser(0);
         }
         user.setSignBills(u.getSignBills());
+
         UserArchives userArchives = queryByUid(id);
         List<OrganizationContactBook> customerContacts = userMapper.findCustomerContacts(id, TokenManager.getAdminId());
         if (!customerContacts.isEmpty()){
@@ -105,6 +107,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
             user.setContactList(collect);
         }
         BeanUtils.copyProperties(userArchives, user);
+        user.setUid(id);
         List<UserArchivesInterview> userArchivesInterviews;
         if (type==0){
             userArchivesInterviews = userArchivesInterviewMapper.selectByUidAid(id, TokenManager.getAdminId());