feat 合并分支

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow")
+@FeignClient(value = "bat-wkflow-zqazqazqa")
 public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -15,7 +15,8 @@ public class ActDefineStartMap {
 
         Map<String,String> map = new TreeMap<>();
         map.put("1","standardLibraryWkflow");
+        map.put("2","standardSurveyWorkFlow");
 
         return map.get(type);
     }
-}
+}

adc-da-main/src/main/resources/application-dev.properties

@@ -9,7 +9,7 @@ spring.datasource.password = root
 
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem
+spring.application.name=FotonLAWSSystem-zqazqazqa
 application.code=20200101
 application.center=1
 #==============================================
@@ -36,7 +36,7 @@ spring.rabbitmq.port=5672
 spring.rabbitmq.virtual-host=uat_pcms
 spring.rabbitmq.username=uat_pcms
 spring.rabbitmq.password=VxsBLL5bJruwzXfS
-# spring.rabbitmq.publisher-confirms=true
+#spring.rabbitmq.publisher-confirms=true
 
 # ==============================================
 # 文档存储路径指向

adc-da-main/src/main/resources/application.properties

@@ -28,19 +28,19 @@ logging.level.org.springframework=info
 # 请求前缀
 restPath=/api
 #server.servlet.context-path=/api
-#Eruept
-eureka.client.allow-redirects=true
-eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://101.36.227.25:8050/eureka/
+
 #是否将自己注册到Eureka Server上，默认为true
-#eureka.client.register-with-eureka=false
+eureka.client.register-with-eureka=true
 ##是否从Eureka Server上获取注册信息，默认为true
-#eureka.client.fetch-registry=false
+eureka.client.fetch-registry=true
+
 
 #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
 #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
 #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
-#eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/
+
+eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/
+
 # 请求连接的超时时间 默认的时间为 1 秒
 ribbon.ConnectTimeout=500000
 # 请求处理的超时时间

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java

@@ -39,7 +39,7 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl<SarUserPersonalM
             return Result.error("userId不能为空");
         }
         QueryWrapper<SarUserPersonalMenu> queryWrapper=new QueryWrapper<>();
-        queryWrapper.eq("user_id",queryWrapper);
+        queryWrapper.eq("user_id",eo.getUserId());
         if(eo.getMenuUrl()!=null)queryWrapper.eq("menu_url",eo.getMenuUrl());
         if(eo.getMenuName()!=null&&eo.getMenuName().trim().length()>0)queryWrapper.like("menu_name",eo.getMenuName().trim());
         if(eo.getState()!=null)queryWrapper.eq("state",eo.getState());

adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml

@@ -421,7 +421,7 @@
     </select>
 
     <!-- 根据角色ID获取所有用户 -->
-    <select id="get" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+    <select id="get" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>
         from TS_USER u