Merge pull request #96 from PSMRI/release-3.2.1

drtechie · web-flow · commit cf9d4771ce37 · 2025-08-13T08:31:56.000+05:30
Release 3.2.1 to main merge
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.admin</groupId>
 	<artifactId>admin-api</artifactId>
-	<version>3.1.0</version>
+	<version>3.2.1</version>
 	<packaging>war</packaging>
 	<name>Admin-API</name>
 	<description>Admin Page</description>
diff --git a/src/main/java/com/iemr/admin/data/user/M_User.java b/src/main/java/com/iemr/admin/data/user/M_User.java
@@ -263,7 +263,7 @@ public void setEmergencyContactNo(String emergencyContactNo) {
 		EmergencyContactNo = emergencyContactNo;
 	}
 
-	public boolean isIsSupervisor() {
+	public Boolean isIsSupervisor() {
 		return IsSupervisor;
 	}
 
@@ -272,7 +272,7 @@ public void setIsSupervisor(boolean isSupervisor) {
 	}
 
 	public boolean isDeleted() {
-		return Deleted;
+		return Boolean.TRUE.equals(Deleted);
 	}
 
 	public void setDeleted(boolean deleted) {

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ public void setEmergencyContactNo(String emergencyContactNo) {`
`263`	`263`	`EmergencyContactNo = emergencyContactNo;`
`264`	`264`	`}`
`265`	`265`
`266`		`- public boolean isIsSupervisor() {`
	`266`	`+ public Boolean isIsSupervisor() {`
`267`	`267`	`return IsSupervisor;`
`268`	`268`	`}`
`269`	`269`
`@@ -272,7 +272,7 @@ public void setIsSupervisor(boolean isSupervisor) {`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`public boolean isDeleted() {`
`275`		`- return Deleted;`
	`275`	`+ return Boolean.TRUE.equals(Deleted);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`public void setDeleted(boolean deleted) {`