|
@@ -86,14 +86,10 @@ public class WorkClientInfoController extends BaseController {
|
|
@RequestMapping(value = {"list", ""})
|
|
@RequestMapping(value = {"list", ""})
|
|
public String list(WorkClientInfo workClientInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public String list(WorkClientInfo workClientInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
|
|
|
- if(StringUtils.isNotBlank(workClientInfo.getCreateId())){
|
|
|
|
- User selectUser = UserUtils.get(workClientInfo.getCreateId());
|
|
|
|
- model.addAttribute("createName", selectUser.getName());
|
|
|
|
- }else{
|
|
|
|
- if(StringUtils.isNotBlank(workClientInfo.getCreateNameStr())){
|
|
|
|
- model.addAttribute("createName", workClientInfo.getCreateNameStr());
|
|
|
|
- }
|
|
|
|
|
|
+ if(StringUtils.isNotBlank(workClientInfo.getCreateNameStr())){
|
|
|
|
+ model.addAttribute("createName", workClientInfo.getCreateNameStr());
|
|
}
|
|
}
|
|
|
|
+
|
|
WorkClientLinkman workClientLinkman = workClientInfo.getWorkClientLinkman();
|
|
WorkClientLinkman workClientLinkman = workClientInfo.getWorkClientLinkman();
|
|
if(workClientLinkman != null){
|
|
if(workClientLinkman != null){
|
|
workClientLinkman.setId("");
|
|
workClientLinkman.setId("");
|