修改各种页面

src/main/java/com/seeyon/apps/collaboration/dao/ColDao.java

@@ -6,6 +6,8 @@ import com.seeyon.apps.collaboration.vo.ColSummaryVO;
 import com.seeyon.apps.collaboration.vo.OrderDetailVO;
 import com.seeyon.ctp.common.exceptions.BusinessException;
 import com.seeyon.ctp.common.supervise.vo.SuperviseModelVO;
+import com.seeyon.ctp.organization.bo.V3xOrgMember;
+import com.seeyon.ctp.organization.po.OrgMember;
 import com.seeyon.ctp.util.FlipInfo;
 
 import java.util.Date;
@@ -282,5 +284,12 @@ public interface ColDao {
 	 * @return
 	 */
     Integer selectMemberSecretLevel(Long id);
+
+	/**
+	 * 查询出accountid
+	 * @param name
+	 * @return
+	 */
+	public List<OrgMember> selectacc(String name);
 }
 

src/main/java/com/seeyon/apps/collaboration/dao/ColDaoImpl.java

@@ -4326,4 +4326,13 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
         n++;
         orderDetailVO.setErpState(object[n] == null ? 0 : ((Number) object[n]).intValue());
     }
+
+    @Override
+    public List<OrgMember> selectacc(String name){
+        Map<String, Object> map = new HashMap();
+        StringBuffer hql = new StringBuffer(" from OrgMember where name = :name");
+        map.put("name", name);
+        List l = DBAgent.find(hql.toString(), map);
+	    return l;
+    }
 }

src/main/java/com/seeyon/apps/collaboration/manager/ColManager.java

@@ -22,6 +22,7 @@ import com.seeyon.ctp.common.po.filemanager.Attachment;
 import com.seeyon.ctp.common.supervise.vo.SuperviseModelVO;
 import com.seeyon.ctp.common.track.bo.TrackAjaxTranObj;
 import com.seeyon.ctp.organization.bo.V3xOrgMember;
+import com.seeyon.ctp.organization.po.OrgMember;
 import com.seeyon.ctp.util.FlipInfo;
 import com.seeyon.ctp.workflow.exception.BPMException;
 import net.joinwork.bpm.definition.BPMProcess;
@@ -1134,4 +1135,6 @@ public interface ColManager {
 	public FlipInfo getOrderStateDetailList(FlipInfo fi, Map param) throws  Exception;
 
 	public Integer selectMemberSecretLevel(Long id);
+
+	public List<OrgMember> selectacc(String name);
 }

src/main/java/com/seeyon/apps/collaboration/manager/ColManagerImpl.java

@@ -112,6 +112,7 @@ import com.seeyon.ctp.form.bean.FormFieldBean;
 import com.seeyon.ctp.organization.bo.*;
 import com.seeyon.ctp.organization.dao.OrgHelper;
 import com.seeyon.ctp.organization.manager.OrgManager;
+import com.seeyon.ctp.organization.po.OrgMember;
 import com.seeyon.ctp.organization.webmodel.WebEntity4QuickIndex;
 import com.seeyon.ctp.plugins.resources.CollaborationPluginUtils;
 import com.seeyon.ctp.plugins.resources.PluginResourceLocation;
@@ -11349,4 +11350,9 @@ public class ColManagerImpl implements ColManager {
     public Integer selectMemberSecretLevel(Long id) {
         return colDao.selectMemberSecretLevel(id);
     }
+
+    @Override
+    public List<OrgMember> selectacc(String name){
+	    return colDao.selectacc(name);
+    }
 }

src/main/java/com/seeyon/ctp/organization/controller/LevelController.java

+package com.seeyon.ctp.organization.controller;
+
+import com.seeyon.apps.collaboration.manager.ColManager;
+import com.seeyon.ctp.common.AppContext;
+import com.seeyon.ctp.common.authenticate.domain.User;
+import com.seeyon.ctp.common.controller.BaseController;
+import com.seeyon.ctp.organization.OrgConstants;
+import com.seeyon.ctp.organization.OrgConstants.Role_NAME;
+import com.seeyon.ctp.organization.manager.OrgManager;
+import com.seeyon.ctp.organization.manager.OrgManagerDirect;
+import com.seeyon.ctp.organization.po.OrgMember;
+import com.seeyon.ctp.util.Strings;
+import com.seeyon.ctp.util.annotation.CheckRoleAccess;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+
+@CheckRoleAccess(
+        roleTypes = {Role_NAME.GroupAdmin, Role_NAME.AccountAdministrator, Role_NAME.HrAdmin, Role_NAME.SystemAdmin}
+)
+public class LevelController extends BaseController {
+    protected OrgManager orgManager;
+    protected OrgManagerDirect orgManagerDirect;
+
+    private ColManager colManager;
+
+    public ColManager getColManager() {
+        if (this.colManager == null) {
+            this.colManager = (ColManager)AppContext.getBean("colManager");
+        }
+
+        return this.colManager;
+    }
+
+    public void setColManager(ColManager colManager) {
+        this.colManager = colManager;
+    }
+
+    public LevelController() {
+    }
+
+    public OrgManager getOrgManager() {
+        return this.orgManager;
+    }
+
+    public void setOrgManager(OrgManager orgManager) {
+        this.orgManager = orgManager;
+    }
+
+    public OrgManagerDirect getOrgManagerDirect() {
+        return this.orgManagerDirect;
+    }
+
+    public void setOrgManagerDirect(OrgManagerDirect orgManagerDirect) {
+        this.orgManagerDirect = orgManagerDirect;
+    }
+
+    public ModelAndView showLevelframe(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView mav = new ModelAndView("apps/organization/level/listLevel");
+        Long accountId = AppContext.currentAccountId();
+        String accountIdStr = request.getParameter("accountId");
+        if (Strings.isNotBlank(accountIdStr)) {
+            accountId = Long.valueOf(accountIdStr);
+        }
+        User user = AppContext.getCurrentUser();
+        if(user.getName().equals("系统管理员")){
+            List<OrgMember> acc = colManager.selectacc("单位管理员");
+            OrgMember use= acc.get(0);
+            accountId = use.getOrgAccountId();
+        }
+        mav.addObject("accountId", accountId);
+        mav.addObject("isGroup", OrgConstants.GROUPID.equals(accountId));
+        return mav;
+    }
+}

src/main/java/com/seeyon/ctp/organization/controller/RoleController.java

+package com.seeyon.ctp.organization.controller;
+
+import com.seeyon.apps.collaboration.manager.ColManager;
+import com.seeyon.ctp.common.AppContext;
+import com.seeyon.ctp.common.authenticate.domain.User;
+import com.seeyon.ctp.common.controller.BaseController;
+import com.seeyon.ctp.organization.OrgConstants;
+import com.seeyon.ctp.organization.OrgConstants.ROLE_BOND;
+import com.seeyon.ctp.organization.OrgConstants.Role_NAME;
+import com.seeyon.ctp.organization.bo.V3xOrgEntity;
+import com.seeyon.ctp.organization.bo.V3xOrgMember;
+import com.seeyon.ctp.organization.bo.V3xOrgRole;
+import com.seeyon.ctp.organization.manager.OrgManager;
+import com.seeyon.ctp.organization.manager.RoleManager;
+import com.seeyon.ctp.organization.po.OrgMember;
+import com.seeyon.ctp.util.Strings;
+import com.seeyon.ctp.util.annotation.CheckRoleAccess;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.servlet.ModelAndView;
+
+@CheckRoleAccess(
+        roleTypes = {Role_NAME.GroupAdmin, Role_NAME.AccountAdministrator, Role_NAME.HrAdmin, Role_NAME.SystemAdmin}
+)
+public class RoleController extends BaseController {
+    private RoleManager roleManager;
+    private OrgManager orgManager;
+
+    private ColManager colManager;
+
+    public ColManager getColManager() {
+        if (this.colManager == null) {
+            this.colManager = (ColManager)AppContext.getBean("colManager");
+        }
+
+        return this.colManager;
+    }
+
+    public void setColManager(ColManager colManager) {
+        this.colManager = colManager;
+    }
+
+    public RoleController() {
+    }
+
+    public ModelAndView showRoleList(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView mav = new ModelAndView("apps/organization/role/roleList");
+        Long accountId = AppContext.currentAccountId();
+        String accountIdStr = request.getParameter("accountId");
+        if (Strings.isNotBlank(accountIdStr)) {
+            accountId = Long.valueOf(accountIdStr);
+        }
+        User user = AppContext.getCurrentUser();
+        if(user.getName().equals("系统管理员")){
+            List<OrgMember> acc = colManager.selectacc("单位管理员");
+            OrgMember use= acc.get(0);
+            accountId = use.getOrgAccountId();
+        }
+        mav.addObject("accountId", accountId);
+        mav.addObject("isGroup", OrgConstants.GROUPID.equals(accountId));
+        return mav;
+    }
+
+    public ModelAndView showMember4Role(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        Long roleId = Long.parseLong(request.getParameter("roleId"));
+        List<V3xOrgMember> members = this.orgManager.getMembersByRole(AppContext.currentAccountId(), roleId);
+        if (!CollectionUtils.isEmpty(members)) {
+            Iterator var5 = members.iterator();
+
+            while(var5.hasNext()) {
+                V3xOrgMember v3xOrgMember = (V3xOrgMember)var5.next();
+                v3xOrgMember.setName("Member");
+            }
+        }
+
+        request.setAttribute("members", members);
+        HashMap m = new HashMap();
+        m.put("flag", 0);
+        if (this.orgManager.getRoleById(roleId).getBond() == ROLE_BOND.DEPARTMENT.ordinal()) {
+            m.put("flag", 1);
+        }
+
+        request.setAttribute("isdeprole", m);
+        return new ModelAndView("apps/organization/role/role4Member");
+    }
+
+    public ModelAndView showEntity4Role(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        Long roleId = Long.parseLong(request.getParameter("roleId"));
+        Long accountId = Long.parseLong(request.getParameter("accountId"));
+        List<V3xOrgEntity> entitys = this.orgManager.getEntitysByRole(accountId, roleId);
+        request.setAttribute("members", entitys);
+        HashMap m = new HashMap();
+        m.put("flag", 0);
+        if (this.orgManager.getRoleById(roleId).getBond() == ROLE_BOND.DEPARTMENT.ordinal()) {
+            m.put("flag", 1);
+        }
+
+        request.setAttribute("isdeprole", m);
+        request.setAttribute("roleId", roleId);
+        request.setAttribute("accountId", accountId);
+        request.setAttribute("isGroup", OrgConstants.GROUPID.equals(accountId));
+        return new ModelAndView("apps/organization/role/role4Member");
+    }
+
+    public ModelAndView createRole(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView result = new ModelAndView("apps/organization/role/roleNew");
+        Long accountId = AppContext.currentAccountId();
+        String accountIdStr = request.getParameter("accountId");
+        if (Strings.isNotBlank(accountIdStr)) {
+            accountId = Long.valueOf(accountIdStr);
+        }
+
+        request.setAttribute("isGroup", OrgConstants.GROUPID.equals(accountId));
+        Map<String, Object> roleMap = new HashMap();
+        roleMap.put("accountId", accountId);
+        roleMap.put("sortId", this.roleManager.getMaxSortId(accountId));
+        request.setAttribute("ffmyfrm", roleMap);
+        return result;
+    }
+
+    public ModelAndView showMembers4RoleCon(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ModelAndView result = new ModelAndView("apps/organization/role/rolemembersList");
+        request.setAttribute("roleid", request.getParameter("roleid"));
+        request.setAttribute("bond", request.getParameter("bond"));
+        return result;
+    }
+
+    public ModelAndView edit(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        Long menuId = Long.parseLong(request.getParameter("id"));
+        V3xOrgRole role = this.roleManager.findById(menuId);
+        Long accountId = AppContext.currentAccountId();
+        String accountIdStr = request.getParameter("accountId");
+        if (Strings.isNotBlank(accountIdStr)) {
+            accountId = Long.valueOf(accountIdStr);
+        }
+
+        request.setAttribute("isGroup", OrgConstants.GROUPID.equals(accountId));
+        Map<String, Object> roleMap = new HashMap();
+        roleMap.put("id", String.valueOf(role.getId()));
+        roleMap.put("name", role.getShowName());
+        roleMap.put("code", role.getCode());
+        roleMap.put("sortId", role.getSortId());
+        roleMap.put("enable", role.getEnabled());
+        roleMap.put("type", role.getType());
+        roleMap.put("description", role.getDescription());
+        roleMap.put("accountId", role.getOrgAccountId());
+        roleMap.put("bond", role.getBond());
+        roleMap.put("isBenchmark", role.getIsBenchmark());
+        roleMap.put("category", role.getCategory());
+        roleMap.put("status", role.getStatus());
+        request.setAttribute("ffmyfrm", roleMap);
+        return new ModelAndView("apps/organization/role/roleNew");
+    }
+
+    public void setRoleManager(RoleManager roleManager) {
+        this.roleManager = roleManager;
+    }
+
+    public void setOrgManager(OrgManager orgManager) {
+        this.orgManager = orgManager;
+    }
+}

src/main/java/com/seeyon/ctp/organization/manager/LevelManagerImpl.java

+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.seeyon.ctp.organization.manager;
+
+import com.seeyon.ctp.common.AppContext;
+import com.seeyon.ctp.common.appLog.AppLogAction;
+import com.seeyon.ctp.common.appLog.manager.AppLogManager;
+import com.seeyon.ctp.common.authenticate.domain.User;
+import com.seeyon.ctp.common.exceptions.BusinessException;
+import com.seeyon.ctp.common.i18n.ResourceUtil;
+import com.seeyon.ctp.datasource.annotation.DataSourceName;
+import com.seeyon.ctp.datasource.annotation.ProcessInDataSource;
+import com.seeyon.ctp.organization.OrgConstants;
+import com.seeyon.ctp.organization.OrgConstants.ORGENT_STATUS;
+import com.seeyon.ctp.organization.OrgConstants.Role_NAME;
+import com.seeyon.ctp.organization.bo.OrganizationMessage;
+import com.seeyon.ctp.organization.bo.V3xOrgAccount;
+import com.seeyon.ctp.organization.bo.V3xOrgLevel;
+import com.seeyon.ctp.organization.dao.OrgCache;
+import com.seeyon.ctp.organization.dao.OrgDao;
+import com.seeyon.ctp.organization.dao.OrgHelper;
+import com.seeyon.ctp.organization.po.OrgLevel;
+import com.seeyon.ctp.organization.principal.PrincipalManager;
+import com.seeyon.ctp.util.FlipInfo;
+import com.seeyon.ctp.util.ParamUtil;
+import com.seeyon.ctp.util.annotation.CheckRoleAccess;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+@ProcessInDataSource(
+        name = DataSourceName.BASE
+)
+public class LevelManagerImpl implements LevelManager {
+    private static final Log logger = LogFactory.getLog(LevelManagerImpl.class);
+    protected OrgCache orgCache;
+    protected OrgDao orgDao;
+    protected OrgManagerDirect orgManagerDirect;
+    protected OrgManager orgManager;
+    protected PrincipalManager principalManager;
+    protected AppLogManager appLogManager;
+
+    public LevelManagerImpl() {
+    }
+
+    public void setOrgDao(OrgDao orgDao) {
+        this.orgDao = orgDao;
+    }
+
+    public void setPrincipalManager(PrincipalManager principalManager) {
+        this.principalManager = principalManager;
+    }
+
+    public void setOrgCache(OrgCache orgCache) {
+        this.orgCache = orgCache;
+    }
+
+    public void setOrgManagerDirect(OrgManagerDirect orgManagerDirect) {
+        this.orgManagerDirect = orgManagerDirect;
+    }
+
+    public void setOrgManager(OrgManager orgManager) {
+        this.orgManager = orgManager;
+    }
+
+    public void setAppLogManager(AppLogManager appLogManager) {
+        this.appLogManager = appLogManager;
+    }
+
+    @CheckRoleAccess(
+            roleTypes = {Role_NAME.GroupAdmin, Role_NAME.AccountAdministrator, Role_NAME.HrAdmin,Role_NAME.SystemAdmin}
+    )
+    public Long saveLevel(String accountId, Map level) throws BusinessException {
+        Long accId = Long.parseLong(accountId);
+        User user = AppContext.getCurrentUser();
+        V3xOrgLevel newlevel = new V3xOrgLevel();
+        ParamUtil.mapToBean(level, newlevel, false);
+        Integer groupLevelId = 100;
+        if (null != newlevel.getGroupLevelId()) {
+            groupLevelId = this.orgManager.getLevelById(newlevel.getGroupLevelId()).getLevelId();
+        }
+
+        boolean isMapRight = this.orgManager.isGroupLevelMapRight(accId, newlevel.getLevelId(), groupLevelId);
+        if (!isMapRight) {
+            V3xOrgLevel errorLevel = this.orgManager.getErrorMapLevel(accId, newlevel.getLevelId(), groupLevelId);
+            if (errorLevel.getLevelId() > newlevel.getLevelId()) {
+                throw new BusinessException(ResourceUtil.getString("level.map.group.low", errorLevel.getName()));
+            } else {
+                throw new BusinessException(ResourceUtil.getString("level.map.group.up", errorLevel.getName()));
+            }
+        } else {
+            if (OrgConstants.GROUPID.equals(newlevel.getOrgAccountId())) {
+                List<V3xOrgAccount> acclist = this.orgManager.getAllAccounts();
+                Iterator var9 = acclist.iterator();
+
+                while(var9.hasNext()) {
+                    V3xOrgAccount v3xOrgAccount = (V3xOrgAccount)var9.next();
+                    List<V3xOrgLevel> allLevels = this.orgManager.getAllLevels(v3xOrgAccount.getId());
+                    Iterator var12 = allLevels.iterator();
+
+                    while(var12.hasNext()) {
+                        V3xOrgLevel v3xOrgLevel = (V3xOrgLevel)var12.next();
+                        if (v3xOrgLevel.getGroupLevelId() != null && v3xOrgLevel.getGroupLevelId().equals(newlevel.getId())) {
+                            boolean isGroupMapRight = this.orgManager.isGroupLevelMapRight(v3xOrgAccount.getId(), v3xOrgLevel.getLevelId(), newlevel.getLevelId());
+                            if (!isGroupMapRight) {
+                                V3xOrgLevel errorLevel = this.orgManager.getErrorMapLevel(v3xOrgAccount.getId(), v3xOrgLevel.getLevelId(), newlevel.getLevelId());
+                                if (errorLevel.getLevelId() > newlevel.getLevelId()) {
+                                    throw new BusinessException(ResourceUtil.getString("level.map.update.group.down", errorLevel.getName(), v3xOrgLevel.getName(), this.orgManager.getAccountById(v3xOrgLevel.getOrgAccountId()).getShortName()));
+                                }
+
+                                throw new BusinessException(ResourceUtil.getString("level.map.update.group.down", errorLevel.getName(), v3xOrgLevel.getName(), this.orgManager.getAccountById(v3xOrgLevel.getOrgAccountId()).getShortName()));
+                            }
+                        }
+                    }
+                }
+            }
+
+            OrganizationMessage m;
+            if (newlevel.getId() == null) {
+                newlevel.setIdIfNew();
+                newlevel.setOrgAccountId(accId);
+                m = this.orgManagerDirect.addLevel(newlevel);
+                OrgHelper.throwBusinessExceptionTools(m);
+                this.appLogManager.insertLog4Account(user, user.isGroupAdmin() ? accId : AppContext.currentAccountId(), AppLogAction.Organization_NewLevel, new String[]{user.getName(), newlevel.getName()});
+            } else {
+                m = this.orgManagerDirect.updateLevel(newlevel);
+                OrgHelper.throwBusinessExceptionTools(m);
+                this.appLogManager.insertLog4Account(user, user.isGroupAdmin() ? accId : AppContext.currentAccountId(), AppLogAction.Organization_UpdateLevel, new String[]{user.getName(), newlevel.getName()});
+            }
+
+            return newlevel.getId();
+        }
+    }
+
+    @CheckRoleAccess(
+            roleTypes = {Role_NAME.GroupAdmin, Role_NAME.AccountAdministrator, Role_NAME.HrAdmin,Role_NAME.SystemAdmin}
+    )
+    public String deleteLevel(List<Map<String, Object>> level) throws BusinessException {
+        new ArrayList();
+        List<V3xOrgLevel> levellist = ParamUtil.mapsToBeans(level, V3xOrgLevel.class, false);
+        OrganizationMessage m = this.orgManagerDirect.deleteLevels(levellist);
+        OrgHelper.throwBusinessExceptionTools(m);
+        List<String[]> appLogs = new ArrayList();
+        User user = AppContext.getCurrentUser();
+        Iterator var6 = levellist.iterator();
+
+        while(var6.hasNext()) {
+            V3xOrgLevel l = (V3xOrgLevel)var6.next();
+            String[] appLog = new String[]{user.getName(), l.getName()};
+            appLogs.add(appLog);
+        }
+
+        this.appLogManager.insertLogs4Account(user, user.isGroupAdmin() ? ((V3xOrgLevel)levellist.get(0)).getOrgAccountId() : AppContext.currentAccountId(), AppLogAction.Organization_DeleteLevel, appLogs);
+        return "";
+    }
+
+    @CheckRoleAccess(
+            roleTypes = {Role_NAME.GroupAdmin, Role_NAME.AccountAdministrator, Role_NAME.HrAdmin,Role_NAME.SystemAdmin}
+    )
+    public HashMap viewLevel(Long levelId) throws BusinessException {
+        HashMap map = new HashMap();
+        ParamUtil.beanToMap(this.orgManager.getLevelById(levelId), map, false);
+        if (!map.containsKey("groupLevelId")) {
+            map.put("groupLevelId", (Object)null);
+        }
+
+        return map;
+    }
+
+    @CheckRoleAccess(
+            roleTypes = {Role_NAME.GroupAdmin, Role_NAME.AccountAdministrator, Role_NAME.HrAdmin,Role_NAME.SystemAdmin}
+    )
+    public FlipInfo showLevelList(FlipInfo fi, Map params) throws BusinessException {
+        Long accountId = Long.valueOf(params.get("accountId").toString());
+        if (params.size() == 0) {
+            this.orgDao.getAllLevelPO(accountId, (Boolean)null, (String)null, (Object)null, fi);
+        } else {
+            this.orgDao.getAllLevelPO(accountId, (Boolean)null, String.valueOf(params.get("condition")), params.get("value"), fi);
+        }
+
+        List list = fi.getData();
+        List rellist = new ArrayList();
+
+        HashMap m;
+        for(Iterator var6 = list.iterator(); var6.hasNext(); rellist.add(m)) {
+            Object object = var6.next();
+            m = new HashMap();
+            ParamUtil.beanToMap((OrgLevel)object, m, true);
+            if (ORGENT_STATUS.DISABLED.ordinal() == Integer.parseInt(String.valueOf(m.get("status")))) {
+                m.put("name", m.get("name") + "(" + ResourceUtil.getString("org.entity.disabled") + ")");
+            }
+
+            if (((OrgLevel)object).getGroupLevelId() != null && !((OrgLevel)object).getGroupLevelId().equals(0L)) {
+                m.put("groupLevelId", this.orgManager.getLevelById(((OrgLevel)object).getGroupLevelId()).getLevelId());
+            } else {
+                m.put("groupLevelId", "");
+            }
+        }
+
+        fi.setData(rellist);
+        return fi;
+    }
+}