111

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerChangeUser.java

@@ -75,7 +75,7 @@ public class ListenerChangeUser implements TaskListener, JavaDelegate {
 		if(StringUtils.isBlank(regular_employee1) && StringUtils.isBlank(regular_date1) && StringUtils.isBlank(regular_whether1)){
 			return;
 		}
-		if(regular_whether1.equals("1")){
+		if(regular_whether1.trim().equals("1") || regular_whether1.trim().equals("是")){
 			try {
 				sysUserMapper.updateTypeInfo(regular_employee1,regular_date1,"转正");
 			}catch (Exception e){