Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project

buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java

@@ -117,6 +117,10 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
 
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) {
+        boolean flags = true;
+        if(flags){
+            return null;
+        }
         try{
             //重试方法
             if (null != requestJson) {

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/comparison/controlsLog/entity/ControlsLogEntity.xml

@@ -62,7 +62,8 @@
             <if test="optionName != null and optionName != ''">option_name ,</if>
             <if test="dataType != null and dataType != ''"> data_type,</if>
             <if test="remark != null and remark != ''"> remark,</if>
-            <if test="sorts == null"> sorts , </if>
+            <if test="sorts != null"> sorts,</if>
+            <!--            <if test="sorts == null"> sorts , </if>-->
             <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
             <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
@@ -83,7 +84,7 @@
             <if test="dataType != null and dataType != ''"> #{dataType},</if>
             <if test="remark != null and remark != ''"> #{remark},</if>
             <if test="sorts != null"> #{sorts} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${dbName} a WHERE a.sts = 'Y' ),</if>
+<!--            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${dbName} a WHERE a.sts = 'Y' ),</if>-->
             <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
             <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>

service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java

@@ -46,41 +46,27 @@ public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService {
 
             com.alibaba.fastjson.JSONObject reqData = com.alibaba.fastjson.JSON.parseObject(jsonStr);
             com.alibaba.fastjson.JSONObject data = reqData.getJSONObject("data");
-            com.alibaba.fastjson.JSONObject orger = data.getJSONObject("pk_org");
             com.alibaba.fastjson.JSONObject ufinterfaceObject = new com.alibaba.fastjson.JSONObject();
-            ufinterfaceObject.put("account", "01");
-            ufinterfaceObject.put("billtype", "user");
+            ufinterfaceObject.put("billtype", "customer");
             ufinterfaceObject.put("isexchange", "Y");
-            ufinterfaceObject.put("roottag", "bill");
-            ufinterfaceObject.put("filename", "user0603");
-            ufinterfaceObject.put("sender", "OA");
-            ufinterfaceObject.put("groupcode", "00");
-
+            ufinterfaceObject.put("replace", "Y");
+            ufinterfaceObject.put("sender", "openUser");
+            ufinterfaceObject.put("account", "ycjf");
+            ufinterfaceObject.put("groupcode", "ycjf");
             com.alibaba.fastjson.JSONObject billObject = new com.alibaba.fastjson.JSONObject();
             com.alibaba.fastjson.JSONObject billheadObject = new com.alibaba.fastjson.JSONObject();
-
-            billheadObject.put("user_name", data.get("user_name"));
-            billheadObject.put("user_code", data.get("user_code"));
-            billheadObject.put("user_password", "Hzya@1314");
-            java.util.Date date = new java.util.Date();
-            java.text.SimpleDateFormat yyyy = new java.text.SimpleDateFormat("yyyy-MM-dd");
-            java.text.SimpleDateFormat mmm = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-            billheadObject.put("pwdparam", yyyy.format(date));
-            billheadObject.put("abledate", mmm.format(date));
-            billheadObject.put("islocked", data.get("islocked"));
-            billheadObject.put("user_type", data.get("user_type"));
-            billheadObject.put("base_doc_type", data.get("base_doc_type"));
-            billheadObject.put("identityverifycode", data.get("identityverifycode"));
-            if(orger != null ){
-                billheadObject.put("pk_org", orger.get("org_code"));
-            }
-            billheadObject.put("format", data.get("format"));
-            billheadObject.put("isca", data.get("isca"));
+            billheadObject.put("code", data.get("code"));
+            billheadObject.put("custprop", data.get("custprop"));
+            billheadObject.put("custstate", data.get("custstate"));
+            billheadObject.put("pk_custclass", data.get("pk_custclass"));
+            billheadObject.put("pk_country", data.get("pk_country"));
+            billheadObject.put("pk_timezone", "P0800");
+            billheadObject.put("pk_format", "ZH-CN");
             billheadObject.put("enablestate", data.get("enablestate"));
-            billheadObject.put("contentlang", data.get("contentlang"));
-            billheadObject.put("user_code_q", data.get("user_code_q"));
-
+            billheadObject.put("name", data.get("name"));
+            billheadObject.put("pk_group", data.get("pk_group"));
+            billheadObject.put("pk_org", data.get("pk_org"));
+            billheadObject.put("taxpayerid", data.get("taxpayerid"));
             billObject.put("billhead", billheadObject);
             ufinterfaceObject.put("bill", billObject);
             bodys.put("ufinterface", ufinterfaceObject);

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");