Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -155,7 +155,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
 
             BaseStudentSchoolRoll baseStudentSchoolRoll=baseStudentUser.getBaseStudentSchoolRollList().get(0);
 
-            if (StrUtil.isNotBlank(baseStudentSchoolRoll.getArchivesStatus())) {
+            if (!StrUtil.isNotBlank(baseStudentSchoolRoll.getArchivesStatus())) {
                 baseStudent.setIsNormal(1);
             } else {
                 DictionaryDetail dictionaryDetail = dictionarydetailService.getOne(Wrappers.<DictionaryDetail>query()
@@ -270,7 +270,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
 
                 BaseStudentSchoolRoll baseStudentSchoolRoll=baseStudentUser.getBaseStudentSchoolRollList().get(0);
 
-                if (StrUtil.isNotBlank(baseStudentSchoolRoll.getArchivesStatus())) {
+                if (!StrUtil.isNotBlank(baseStudentSchoolRoll.getArchivesStatus())) {
                     baseStudent.setIsNormal(1);
                 } else {
                     DictionaryDetail dictionaryDetail = dictionarydetailService.getOne(Wrappers.<DictionaryDetail>query()

src/main/java/com/xjrsoft/module/teacher/service/impl/TeacherbaseManagerServiceImpl.java

@@ -110,7 +110,7 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             baseTeacher.setUserId(xjrUser.getId());
 
-            if (StrUtil.isNotBlank(baseTeacher.getJobState())) {
+            if (!StrUtil.isNotBlank(baseTeacher.getJobState())) {
                 baseTeacher.setIsNormal(1);
             } else {
                 DictionaryDetail dictionaryDetail = dictionarydetailService.getOne(Wrappers.<DictionaryDetail>query()
@@ -261,7 +261,7 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             for (BaseTeacher baseTeacher : xjrUser.getBaseTeacherList()) {
 
-                if (StrUtil.isNotBlank(baseTeacher.getJobState())) {
+                if (!StrUtil.isNotBlank(baseTeacher.getJobState())) {
                     baseTeacher.setIsNormal(1);
                 } else {
                     DictionaryDetail dictionaryDetail = dictionarydetailService.getOne(Wrappers.<DictionaryDetail>query()