主数据按钮，保存到菜单表

service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java

@@ -48,6 +48,7 @@ import com.hzya.frame.sysnew.popedomOperate.dao.ISysPopedomOperateDao;
 import com.hzya.frame.sysnew.popedomOperate.entity.SysPopedomOperateEntity;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.web.exception.BaseSystemException;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1453,7 +1454,11 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                 }
             }
         }
-        mdmModuleDao.alterTableField(entity);
+        try {
+            mdmModuleDao.alterTableField(entity);
+        } catch (Exception e){
+            throw new BaseSystemException("表字段类型，修改失败，请联系管理员");
+        }
         return BaseResult.getSuccessMessageEntity("修改字段成功");
     }
 
@@ -1667,6 +1672,25 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         object1.put("viewType", entity.getViewName());//1、树 2、列表
         module.setOptions(object1.toString());//菜单mate参数
         sysMenuConfigDao.save(module);
+        SysButtonConfigEntity buttonConfigEntity = new SysButtonConfigEntity();
+        buttonConfigEntity.setMenuId(module.getId());
+        buttonConfigEntity.setSts("Y");
+        List<SysButtonConfigEntity> sysButtonConfigEntities = sysButtonConfigDao.queryBase(buttonConfigEntity);
+        //1、查询按钮权限
+        SysPopedomOperateEntity sysPopedomOperateEntity = new SysPopedomOperateEntity();
+        sysPopedomOperateEntity.setMenuId(module.getId());
+        sysPopedomOperateEntity.setSts("Y");
+        List<SysPopedomOperateEntity> sysPopedomOperateEntities = sysPopedomOperateDao.queryBase(sysPopedomOperateEntity);
+        //删除按钮和删除按钮权限
+        sysButtonConfigDao.logicRemoveMultiCondition(buttonConfigEntity);
+        sysPopedomOperateDao.logicRemoveMultiCondition(sysPopedomOperateEntity);
+        MdmModuleViewButtonEntity mdmModuleViewButtonEntity = new MdmModuleViewButtonEntity();
+        mdmModuleViewButtonEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleViewButtonEntity.setSts("Y");
+        List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity);
+
+        //删除处理权限
+        doMdmModuleButton(module,mdmModuleViewButtonEntities,sysButtonConfigEntities,sysPopedomOperateEntities);
         return BaseResult.getSuccessMessageEntity("保存显示类型成功");
 
     }
@@ -1720,6 +1744,25 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             object1.put("viewType", entity.getViewName());//1、树 2、列表
             module.setOptions(object1.toString());//菜单mate参数
             sysMenuConfigDao.update(module);
+            SysButtonConfigEntity buttonConfigEntity = new SysButtonConfigEntity();
+            buttonConfigEntity.setMenuId(module.getId());
+            buttonConfigEntity.setSts("Y");
+            List<SysButtonConfigEntity> sysButtonConfigEntities = sysButtonConfigDao.queryBase(buttonConfigEntity);
+            //1、查询按钮权限
+            SysPopedomOperateEntity sysPopedomOperateEntity = new SysPopedomOperateEntity();
+            sysPopedomOperateEntity.setMenuId(module.getId());
+            sysPopedomOperateEntity.setSts("Y");
+            List<SysPopedomOperateEntity> sysPopedomOperateEntities = sysPopedomOperateDao.queryBase(sysPopedomOperateEntity);
+            //删除按钮和删除按钮权限
+            sysButtonConfigDao.logicRemoveMultiCondition(buttonConfigEntity);
+            sysPopedomOperateDao.logicRemoveMultiCondition(sysPopedomOperateEntity);
+            MdmModuleViewButtonEntity mdmModuleViewButtonEntity = new MdmModuleViewButtonEntity();
+            mdmModuleViewButtonEntity.setMdmId(mdmModuleEntity.getId());
+            mdmModuleViewButtonEntity.setSts("Y");
+            List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity);
+
+            //删除处理权限
+            doMdmModuleButton(module,mdmModuleViewButtonEntities,sysButtonConfigEntities,sysPopedomOperateEntities);
         }
         return BaseResult.getSuccessMessageEntity("修改显示类型成功");
     }

service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java

@@ -8,6 +8,8 @@ import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
 import com.hzya.frame.sysnew.login.ILoginService;
 import com.hzya.frame.sysnew.organ.dao.ISysOrganDao;
 import com.hzya.frame.sysnew.organ.entity.SysOrganEntity;
+import com.hzya.frame.sysnew.person.dao.ISysPersonDao;
+import com.hzya.frame.sysnew.person.entity.SysPersonEntity;
 import com.hzya.frame.sysnew.popedomInterface.entity.SysPopedomInterfaceEntity;
 import com.hzya.frame.sysnew.popedomInterface.service.impl.InterfaceCache;
 import com.hzya.frame.sysnew.sysInterface.entity.SysInterfaceEntity;
@@ -37,6 +39,8 @@ public class LoginServiceImpl implements ILoginService {
     @Resource
     private ISysUserDao sysUserDao;
     @Resource
+    private ISysPersonDao sysPersonDao;
+    @Resource
     private ISysOrganDao sysOrganDao;
 
     @Resource
@@ -70,6 +74,12 @@ public class LoginServiceImpl implements ILoginService {
         if (sysUserEntity.getState() == null || !"0".equals(sysUserEntity.getState())) {
             return BaseResult.getFailureMessageEntity("当前用户已停用，请先启用");
         }
+        if(sysUserEntity.getPersonId() != null &&!"".equals(sysUserEntity.getPersonId())){
+            SysPersonEntity sysPersonEntity = sysPersonDao.get(sysUserEntity.getPersonId());
+            if(sysPersonEntity != null && sysPersonEntity.getPersonName()!= null){
+                sysUserEntity.setPersonName(sysPersonEntity.getPersonName());
+            }
+        }
         //校验当前登陆人是否有权限
         //boolean flag = false;
         //SysInterfaceEntity sysInterfaceEntity = (SysInterfaceEntity) interfaceCache.get("6","beanNameloginServiceinterfacNamedoLogin");