调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/mapper/xml/JyWorkContractInfoMapper.xml

@@ -197,7 +197,7 @@
 	</update>
 
 	<select id="findType" resultType="string">
-		SELECT dv.label from sys_dict_value dv LEFT JOIN sys_dict_type dt on dt.id=dv.dict_type_id where dv.`id`=#{contractType} and dt.type='jy_contract_type'
+		SELECT dv.label from sys_dict_value dv LEFT JOIN sys_dict_type dt on dt.id=dv.dict_type_id where dv.value=#{contractType} and dt.type='jy_contract_type_up'
 	</select>
 
 	<select id="findType2" resultType="string">

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractService.java

@@ -120,10 +120,10 @@ public class JyWorkContractService {
             //合同类型查询
             StringBuffer stringBuffer = new StringBuffer();
             String typeData="";
-            if (StringUtils.isNotEmpty(i.getContractTypeFirst())){
+            if (StringUtils.isNotBlank(i.getContractTypeFirst())){
                  typeData = jyWorkContractInfoMapper.findType(i.getContractTypeFirst());
             }
-            if (StringUtils.isNotEmpty(i.getContractType())){
+            if (StringUtils.isNotBlank(i.getContractType())){
                     String[] split = i.getContractType().split(",");
                     for (int j = 0; j < split.length; j++) {
                         String type= jyWorkContractInfoMapper.findType2(split[j]);
@@ -350,13 +350,16 @@ public class JyWorkContractService {
             String newType="";
             List<String> stringList = new ArrayList<>();
             ArrayList<List<String>> jyWorkContractInfos = new ArrayList<>();
-            if (!info.getContractType().contains(",")){
+            if (StringUtils.isBlank(info.getContractType())){
+                stringList.add(info.getContractTypeFirst());
+                jyWorkContractInfos.add(stringList);
+            }else if (StringUtils.isNotBlank(info.getContractType()) && !info.getContractType().contains(",")){
 //                String type= jyWorkContractInfoMapper.findType(info.getContractType());
 //                info.setContractType(type);
                 stringList.add(info.getContractTypeFirst());
                 stringList.add(info.getContractType());
                 jyWorkContractInfos.add(stringList);
-            }else {
+            }else if (info.getContractType().contains(",")){
                 String[] split = info.getContractType().split(",");
                 Integer count=0;
                 //将切割好的二级类型进行遍历,与一级类型一起存放到数组中,方便前端级联回显

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -699,7 +699,8 @@ public class FlowTaskService {
         }
         //设置请假天数
         if (StrUtil.isNotBlank(days)){
-            vars.put(FlowableConstant.DAYS,days);
+            Double day = Double.valueOf(days);
+            vars.put(FlowableConstant.DAYS,day);
         }
         //设置是否通过
         if (StrUtil.isNotBlank(isPass)){